cloudstack/api
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
..
src Merge branch 'master' into planner_reserve 2013-05-15 14:44:56 -07:00
test remove unwanted files 2013-05-12 14:30:10 +05:30
pom.xml CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30