Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9673C179CF for ; Thu, 19 Nov 2015 17:03:17 +0000 (UTC) Received: (qmail 44141 invoked by uid 500); 19 Nov 2015 17:03:17 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 43839 invoked by uid 500); 19 Nov 2015 17:03:17 -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 43669 invoked by uid 99); 19 Nov 2015 17:03:17 -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, 19 Nov 2015 17:03:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E7D0FE17EF; Thu, 19 Nov 2015 17:03:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Thu, 19 Nov 2015 17:03:20 -0000 Message-Id: <5ba8751c5e21486db7f69758b1f6be51@git.apache.org> In-Reply-To: <69d2825b062b4a38a2dfd40653e72b43@git.apache.org> References: <69d2825b062b4a38a2dfd40653e72b43@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: updated refs/heads/master to 76f430c Merge release branch 4.6 to master * 4.6: CLOUDSTACK-9015 - Delete public IP in order to get both IP and NAT rule removed. CLOUDSTACK-9015 - Add test to cover the rVPC routers stop/start/reboot scenario CLOUDSTACK-9015 - Make sure the Backup router can talk to the Master router after a stop/start/reboot Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76f430cf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76f430cf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76f430cf Branch: refs/heads/master Commit: 76f430cfc3e525d3442b036739442e7abe084b1d Parents: 791f9df 78e5518 Author: Remi Bergsma Authored: Thu Nov 19 18:02:13 2015 +0100 Committer: Remi Bergsma Committed: Thu Nov 19 18:02:13 2015 +0100 ---------------------------------------------------------------------- .../debian/config/opt/cloud/bin/configure.py | 6 +- .../debian/config/opt/cloud/bin/cs/CsAddress.py | 7 ++- .../config/opt/cloud/bin/cs/CsRedundant.py | 60 +++++++++++--------- .../debian/config/opt/cloud/bin/master.py | 2 +- .../opt/cloud/templates/keepalived.conf.templ | 4 +- .../integration/component/test_vpc_redundant.py | 42 +++++++++++++- 6 files changed, 85 insertions(+), 36 deletions(-) ----------------------------------------------------------------------