cloudstack/plugins/hypervisors/kvm
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
..
src Merge branch 'pvlan' 2013-05-15 16:08:08 -07:00
test CLOUDSTACK-1158: Wrap qemu-img into it's own util 2013-04-01 16:37:58 -07:00
.pydevproject License header updates for the plugins folder. 2012-08-03 09:07:43 -04:00
agent-descriptor.xml build kvm-agent.zip 2012-10-02 15:38:34 -07:00
pom.xml fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00