cloudstack/engine/schema
Prachi Damle fb18223933 Merge branch 'master' into planner_reserve
Conflicts:
	api/src/com/cloud/event/EventTypes.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
	server/test/resources/affinityContext.xml
	setup/db/db/schema-410to420.sql
2013-05-08 17:02:35 -07:00
..
src Merge branch 'master' into planner_reserve 2013-05-08 17:02:35 -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