etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup
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
..
bindir packaging: move jasypt jar to cloudstack-common 2013-04-05 16:12:27 +02:00
db Merge branch 'master' into planner_reserve 2013-05-15 14:44:56 -07:00
dev merge master 2013-05-11 15:28:43 +05:30