Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' ... Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java		2013-10-23 10:40:44 -07:00
..
bigswitch-vns	Refactor missed classes	2013-10-17 16:00:11 -07:00
cisco-vnmc	Cleaner and more type safe Transaction API for checked exceptions	2013-10-23 10:02:43 -07:00
dns-notifier	Cleanup pom.xml in various projects to properly use managed versions and other defaults	2013-09-21 17:21:06 +08:00
elastic-loadbalancer	Merge remote-tracking branch 'origin/txn-refactor'	2013-10-23 10:40:44 -07:00
f5	sdn hosted vpc gateways (using lswitch)	2013-09-18 16:56:56 +02:00
internal-loadbalancer	CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled	2013-10-22 12:44:23 +02:00
juniper-srx	Remove Network Parameter for VPN service provider	2013-10-17 17:55:47 -07:00
midonet	Refactor missed classes	2013-10-17 16:00:11 -07:00
netscaler	Refactor missed classes	2013-10-17 16:00:11 -07:00
nicira-nvp	Refactor missed classes	2013-10-17 16:00:11 -07:00
ovs	sdn hosted vpc gateways (using lswitch)	2013-09-18 16:56:56 +02:00
stratosphere-ssp	Moved NetworkManager to NetworkOrchestrationService	2013-09-06 15:40:31 -07:00
vxlan	CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor	2013-09-26 23:37:18 +09:00