etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/test/integration
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
..
component CLOUDSTACK-702: Tests for Multiple IP Ranges 2013-05-14 15:52:54 +05:30
smoke Merge branch 'master' into planner_reserve 2013-05-15 14:44:56 -07:00
__init__.py apply chip childers licensing patches for the test directory 2012-06-26 11:19:58 -04:00