etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine
History
Prachi Damle ed8ff40f7f Merge branch 'master' into planner_reserve 
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-05-15 14:44:56 -07:00
..
api merge master 2013-05-11 15:28:43 +05:30
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-2486: Deleting the host_details and inserting them back can lead to mysql deadlock 2013-05-15 11:16:41 -07:00
planning/src/org/apache/cloudstack/platform/planning Added engine 2012-11-05 09:14:14 -08:00
schema Merge branch 'master' into planner_reserve 2013-05-15 14:44:56 -07:00
service CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
storage Merge branch 'master' into planner_reserve 2013-05-15 14:44:56 -07:00
pom.xml merge master 2013-05-11 15:28:43 +05:30