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
Sheng Yang 2d2c0c48cd Merge branch 'pvlan' 
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
 		2013-05-15 16:08:08 -07:00
..
component CLOUDSTACK-702: Tests for Multiple IP Ranges 2013-05-14 15:52:54 +05:30
smoke Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00
__init__.py apply chip childers licensing patches for the test directory 2012-06-26 11:19:58 -04:00