Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 ... Conflicts: server/src/com/cloud/network/NetworkModelImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java		2013-05-03 12:50:59 -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	Merge branch 'master' into internallb1	2013-05-01 10:39:10 -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-05-03 12:50:59 -07:00
nicira-nvp	CLOUDSTACK-2092 Don't push IP to the Nicira Controller when it is about	2013-04-19 16:28:53 +02:00
ovs	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30