etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors
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
..
baremetal CLOUDSTACK-702: Multiple ip ranges in different subnets. 2013-05-13 17:06:44 +05:30
kvm Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00
ovm CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30
simulator Fixed up the simulator to run with windows paths in cygwin 2013-05-06 16:34:41 -07:00
ucs Removing ^M's from code. 2013-04-04 00:53:20 +05:30
vmware CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +05:30
xen Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00