Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EE4772007D1 for ; Thu, 12 May 2016 17:04:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED0A91602BF; Thu, 12 May 2016 15:04:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 43498160A1B for ; Thu, 12 May 2016 17:04:34 +0200 (CEST) Received: (qmail 12792 invoked by uid 500); 12 May 2016 15:04:30 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 12223 invoked by uid 99); 12 May 2016 15:04:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2016 15:04:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5F1CADFB73; Thu, 12 May 2016 15:04:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 12 May 2016 15:04:46 -0000 Message-Id: <236e1b44783d4bcb8fcd32110612d04f@git.apache.org> In-Reply-To: <25c777d33433472d8d4c8099ab1772e4@git.apache.org> References: <25c777d33433472d8d4c8099ab1772e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/17] git commit: updated refs/heads/4.8 to dbbc37e archived-at: Thu, 12 May 2016 15:04:35 -0000 Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-9287 - Improve test by checking if pvt gw is removed and fix typos Handle private gateways more reliably CLOUDSTACK-9287 - Fix RVR public interface CLOUDSTACK-9287 - Add integration test to cover the private gateway related changes CLOUDSTACK-9287 - Refactor the interface state configuration CLOUDSTACK-9287 - Check if the nic profile has already been removed from a certain router CLOUDSTACK-9287 - Bring up the private gw interface on state change to master CLOUDSTACK-9287 - Make sure private gw interface is not used for default gw CLOUDSTACK-9287 - Add integration test to cover the private gw interface/mac address issues CLOUDSTACK-9287 - Put private gateway interface down on backup router CLOUDSTACK-9287 - Generate new mac address if router is redundant and nic profile exists Add private gateway IP to router initialization config apply static routes on change to master state Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dbbc37ec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dbbc37ec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dbbc37ec Branch: refs/heads/4.8 Commit: dbbc37ecc78d3b633b10cb55507e27481d7f0985 Parents: 72811b4 3fab757 Author: Will Stevens Authored: Thu May 12 11:03:57 2016 -0400 Committer: Will Stevens Committed: Thu May 12 11:03:57 2016 -0400 ---------------------------------------------------------------------- .../network/element/VirtualRouterElement.java | 26 +- .../element/VpcVirtualRouterElement.java | 25 +- .../network/router/CommandSetupHelper.java | 4 +- .../network/router/NicProfileHelperImpl.java | 5 + .../VpcVirtualNetworkApplianceManagerImpl.java | 24 +- .../network/vpc/NetworkACLManagerImpl.java | 16 +- .../topology/AdvancedNetworkTopology.java | 13 +- .../debian/config/opt/cloud/bin/configure.py | 52 +-- .../debian/config/opt/cloud/bin/cs/CsAddress.py | 58 ++-- .../debian/config/opt/cloud/bin/cs/CsHelper.py | 26 +- .../config/opt/cloud/bin/cs/CsRedundant.py | 90 ++--- .../config/opt/cloud/bin/cs/CsStaticRoutes.py | 42 +++ .../debian/config/opt/cloud/bin/merge.py | 46 +++ test/integration/smoke/test_privategw_acl.py | 336 +++++++++++++++++-- 14 files changed, 569 insertions(+), 194 deletions(-) ----------------------------------------------------------------------