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 |
|
Wilder Rodrigues
|
b97f2b05c7
|
apply network acls; acls items to pvt gw; vpc ip association
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
|
2014-10-14 15:01:14 +02:00 |
|
Wilder Rodrigues
|
b9ffe2329e
|
making instance variables compliant with ACS convention
Conflicts:
server/src/com/cloud/network/rules/LoadBalancingRules.java
server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
|
2014-10-14 15:00:32 +02:00 |
Daan Hoogland
|
e1866bf90d
|
package rename
Conflicts:
server/src/com/cloud/network/rules/DhcpEntryRules.java
server/src/com/cloud/network/rules/DhcpSubNetRules.java
|
2014-10-14 14:55:25 +02:00 |
Antonio Fornie
|
1a85213bbf
|
Rules and visitors for Load Balance Rules
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
|
2014-10-14 14:46:38 +02:00 |