etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test
History
Murali Reddy a718d353f7 Merge branch 'master' into portablepublicip 
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/addr/PublicIp.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-05-13 21:22:19 +05:30
..
com/cloud Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
org/apache/cloudstack Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
resources CLOUDSTACK-702: Multiple ip ranges in different subnets. 2013-05-13 17:06:44 +05:30
async-job-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00