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
..
elastic-loadbalancer	VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr	2012-08-03 14:23:45 -07:00
f5	fixing a few more license headers	2012-07-24 10:47:03 -04:00
juniper-srx	VPC: multiple fixes:	2012-07-02 17:44:54 -07:00
netscaler	Merge branch 'master' into vpc	2012-07-23 10:36:25 -07:00
nicira-nvp	Add a "ping" function to the resource and allow commands to be retried.	2012-08-01 14:11:32 +02:00
ovs	Phase 1 of Nicira integration	2012-07-11 17:16:06 -07:00