Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr ...

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java

2012-08-03 14:23:45 -07:00

..

kvm

Merge branch 'master' into vpc

2012-08-02 18:45:37 -07:00

ovm

bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager

2012-07-27 23:37:46 -04:00

vmware

VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr

2012-08-03 14:23:45 -07:00

xen

VPC : handle Revoke rules for staticroute

2012-08-02 18:59:49 -07:00