You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/07 21:42:33 UTC
[10/10] git commit: updated refs/heads/master to e08294a
Merge release branch 4.6 to master
* 4.6:
CLOUDSTACK-9106 - Makes Enum name compliant with Java code conventions.
CLOUDSTACK-9106 - Adds a test to cover the changes in the applyVpnUsers() method
CLOUDSTACK-9106 - Makes the router commands call more consistent.
CLOUDSTACK-9106 - Enables private gateway tests on Redundant VPCs
CLOUDSTACK-9106 - Refactor the createPrivateNicProfileForGateway() method
CLOUDSTACK-9106 - Reduces the amount of iterations through the routers of a VPC
Add support for not (re)starting server after cloud-setup-management.
Closed PRs that will not be considered for merge:
This closes #1158
This closes #1097
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e08294a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e08294a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e08294a9
Branch: refs/heads/master
Commit: e08294a95f5f1dbc0d32aab9f4a67a053a421706
Parents: e443a0c 6d3fffa
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Dec 7 21:36:05 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Dec 7 21:36:36 2015 +0100
----------------------------------------------------------------------
client/bindir/cloud-setup-management.in | 11 +-
.../com/cloud/network/element/OvsElement.java | 126 +++++++------
python/lib/cloudutils/globalEnv.py | 6 +-
python/lib/cloudutils/serviceConfigServer.py | 35 ++--
.../network/element/VirtualRouterElement.java | 93 +++++----
.../element/VpcVirtualRouterElement.java | 79 ++++----
.../cloud/network/router/NicProfileHelper.java | 3 +-
.../network/router/NicProfileHelperImpl.java | 18 +-
.../network/router/VpcNetworkHelperImpl.java | 2 +-
.../network/rules/PrivateGatewayRules.java | 28 +--
.../topology/AdvancedNetworkTopology.java | 22 +--
.../network/topology/BasicNetworkTopology.java | 110 ++++++-----
.../network/topology/NetworkTopology.java | 22 +--
.../topology/NetworkTopologyContext.java | 16 ++
.../element/VpcVirtualRouterElementTest.java | 188 +++++++++++++++++++
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 9 +-
test/integration/smoke/test_privategw_acl.py | 4 -
17 files changed, 502 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e08294a9/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e08294a9/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e08294a9/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------