Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java		2012-07-31 13:37:28 -07:00
..
elastic-loadbalancer	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
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	Use the name of the network (or uuid) as display text of the nicira logical switch.	2012-07-30 15:17:46 +02:00
ovs	Phase 1 of Nicira integration	2012-07-11 17:16:06 -07:00