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
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	adding new bean to spring context file; renaming package from "com" to "org"	2014-10-14 15:01:13 +02:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	apply network acls; acls items to pvt gw; vpc ip association	2014-10-14 15:01:14 +02:00
test	apply network acls; acls items to pvt gw; vpc ip association	2014-10-14 15:01:14 +02:00
pom.xml	server: fix server package after auth plugin refactor	2014-08-28 19:45:23 +02:00