cloudstack/engine
Prachi Damle 4a1eaf45bd Merge branch 'master' into affinity_groups
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-10 11:34:30 -07:00
..
api fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -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 Merge branch 'master' into affinity_groups 2013-04-10 11:34:30 -07:00
planning/src/org/apache/cloudstack/platform/planning Added engine 2012-11-05 09:14:14 -08:00
schema CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +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 fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00
pom.xml CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30