Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc ...

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql

2012-07-13 13:52:58 -07:00

..

elastic-loadbalancer

Merge branch 'master' into vpc

2012-07-13 13:52:58 -07:00

f5

moving out Srx code into Plugins/network-elements

2012-06-25 16:55:53 -07:00

juniper-srx

VPC: multiple fixes:

2012-07-02 17:44:54 -07:00

netscaler

VPC: multiple fixes:

2012-07-02 17:44:54 -07:00

nicira-nvp

Phase 1 of Nicira integration

2012-07-11 17:16:06 -07:00

ovs

Phase 1 of Nicira integration

2012-07-11 17:16:06 -07:00