cloudstack/server
Remi Bergsma 7e902cd505 Merge release branch 4.6 to master
* 4.6:
  CLOUDSTACK-9075 - Uses the same vlan since it should have been already released
  CLOUDSTACK-9075 - Adds VPC static routes test
  CLOUDSTACK-9075 - Covers Private GW ACL with Redundant VPCs
  CLOUDSTACK-9075 - Add method to get list of Physical Networks per zone
  CLOUDSTACK-6276 Removing unused parameter in integration test for projects
  CLOUDSTACK-6276 Removing unused parameter in integration test
  CLOUDSTACK-6276 Fixing affinity groups for projects
2015-12-03 20:42:41 +01:00
..
conf CLOUDSTACK-9062: Improve S3 implementation. 2015-11-19 15:29:10 +01:00
resources Merge branch 'volume-upload' into master 2015-04-29 11:12:53 +05:30
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge release branch 4.6 to master 2015-12-03 20:42:41 +01:00
test Merge release branch 4.6 to master 2015-12-03 20:42:41 +01:00
pom.xml Updating pom.xml version numbers for release 4.7.0-SNAPSHOT 2015-11-15 18:54:13 +01:00