etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/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
..
bindirbak apply chip childers licensing patches for the test directory 2012-06-26 11:19:58 -04:00
conf Uniting all the READMEs from tools and test 2012-10-12 17:01:20 +05:30
integration Merge branch 'master' into portablepublicip 2013-05-13 21:22:19 +05:30
metadata License header updates for the test folder. 2012-08-03 10:39:05 -04:00
scripts CLOUDSTACK-28 wget.exe (GPLed) is present in the tools directory as a binary 2012-09-24 10:31:47 -04:00
selenium merge master 2013-05-11 15:28:43 +05:30
src/com/cloud Remove @author tag from non third-party source files in agent-simulator, cloud-cli, test, ui and utils folder 2012-08-13 15:30:42 +08: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
setup-test-data.sh Bash is not python! 2012-10-30 10:37:16 +05:30