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
..
com/cloud	apply network acls; acls items to pvt gw; vpc ip association	2014-10-14 15:01:14 +02:00
org/apache/cloudstack	CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects	2014-09-03 10:07:19 -04:00
resources	removed trailing space	2014-08-13 11:09:38 -07:00
async-job-component.xml	Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin	2014-06-07 04:50:23 -04:00
sync-queue-component.xml	License header updates for the server folder.	2012-08-03 09:41:27 -04:00