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

..

kvm

Send only \n rather than \r\n to agent socket when sending cmdline

2013-04-10 13:27:10 -06:00

xenserver

Merge branch 'pvlan'

2013-05-15 16:08:08 -07:00

versions.sh

license header changes for scripts folder from Chip Childers

2012-06-23 00:58:00 -04:00