cloudstack/server/resources
Wilder Rodrigues 1365acd200 finished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected.
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
2014-10-03 06:21:24 +02:00
..
META-INF/cloudstack finished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected. 2014-10-03 06:21:24 +02:00
com/cloud/upgrade removed unused class 2014-09-09 18:31:13 -07:00