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/11/19 18:03:20 UTC
[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 <gi...@remi.nl>
Authored: Thu Nov 19 18:02:13 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
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(-)
----------------------------------------------------------------------