etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine
History
Murali Reddy f82c6a8431 Merge branch 'master' into portablepublicip 
Conflicts:
	api/src/com/cloud/network/IpAddress.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
	setup/db/db/schema-410to420.sql
 		2013-05-11 23:32:13 +05:30
..
api Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
components-api Removing ^M's from code. 2013-04-04 00:53:20 +05:30
compute CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
network CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
orchestration CLOUDSTACK-2096 Deployment Planner - Deployment planner is not looking for hosts in other clusters when vm is being started. 2013-04-19 17:55:37 -07:00
planning/src/org/apache/cloudstack/platform/planning Added engine 2012-11-05 09:14:14 -08:00
schema Merge branch 'master' into portablepublicip 2013-05-11 23:32:13 +05:30
service CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
storage CLOUDSTACK-1603: Management server .log Java Exceptions are displayed with Alerts 2013-05-10 10:18:37 +05:30
pom.xml Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema. 2013-05-06 16:34:16 -07:00