Alena Prokharchyk 014689e45e Merge branch 'master' into internallb1 ... Conflicts: api/src/com/cloud/network/Network.java plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java setup/db/db/schema-410to420.sql		2013-04-16 09:55:45 -07:00
..
bigswitch-vns	BigSwitch networking plugin update	2013-03-29 18:54:48 +05:30
cisco-vnmc	Squashed commit of the following:	2013-04-15 18:58:43 +05:30
dns-notifier	Fixed typos	2013-04-13 13:28:32 +00:00
elastic-loadbalancer	Internal LB:	2013-04-10 16:29:05 -07:00
f5	Merge branch 'master' into internallb1	2013-04-16 09:55:45 -07:00
internal-loadbalancer	InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network	2013-04-16 09:50:07 -07:00
juniper-srx	CLOUDSTACK-312: enable L4-L7 network services in the shared network in	2013-04-14 17:50:15 +05:30
midonet	Correcting missing license headers in two MidoNet plugin files	2013-04-03 20:33:25 +01:00
netscaler	Merge branch 'master' into internallb1	2013-04-16 09:55:45 -07:00
nicira-nvp	Prachi's commit 20a747601c introduced a	2013-02-21 14:08:56 +01:00
ovs	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30