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

Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java

2012-07-27 13:47:46 -07:00

..

elastic-loadbalancer

Merge branch 'master' into vpc

2012-07-27 13:47:46 -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

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