cloudstack/server/resources/META-INF/cloudstack/core
Wilder Rodrigues 546e563c27 refactor all private methods in the virtual router appliance and VPC appliance
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/DhcpEntryRules.java
	server/src/com/cloud/network/rules/LoadBalancingRules.java
	server/src/com/cloud/network/rules/RuleApplier.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
2014-10-14 15:08:09 +02:00
..
spring-server-core-managers-context.xml refactor all private methods in the virtual router appliance and VPC appliance 2014-10-14 15:08:09 +02:00
spring-server-core-misc-context.xml Fix unnecessary changes Spring contexts 2014-10-14 15:01:17 +02:00