cloudstack/plugins/network-elements
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
..
bigswitch-vns Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -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/spring-modularization' 2013-10-23 11:14:42 -07:00
f5 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
internal-loadbalancer Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
juniper-srx Remove Network Parameter for VPN service provider 2013-10-17 17:55:47 -07:00
midonet Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
netscaler Refactor missed classes 2013-10-17 16:00:11 -07:00
nicira-nvp Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
ovs Spring Modularization 2013-10-02 15:41:04 -07:00
stratosphere-ssp Spring Modularization 2013-10-02 15:41:04 -07:00
vxlan Spring Modularization 2013-10-02 15:41:04 -07:00