etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/scripts
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
..
installer license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00
network Summary: Release old DHCP entries 2013-05-03 14:09:52 -06:00
storage CLOUDSTACK-922: LXC Support in Cloudstack. 2013-04-01 15:41:42 -07:00
util CloudStack CLOUDSTACK-774 2013-02-21 15:46:11 -08:00
vm Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00
.pydevproject License header updates for the scripts folder. 2012-08-03 09:38:28 -04:00