cloudstack/scripts/vm
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
..
hypervisor Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00
network PVLAN: Optimize pvlan scripts 2013-05-06 17:51:33 -07:00
systemvm Detect if we are root based on the effective uid instead of the username. Allows sysadmins to specifiy their own username if they want. 2013-04-10 16:34:31 +02:00
pingtest.sh license header changes for scripts folder from Chip Childers 2012-06-23 00:58:00 -04:00