Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 ... Conflicts: server/src/com/cloud/network/NetworkModelImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java		2013-05-03 12:50:59 -07:00
..
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 internallb1	2013-05-03 12:50:59 -07:00
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	CLOUDSTACK-2282: Selenium Headless configuration using PhantomJS.	2013-05-01 17:17:15 -07:00
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