Merge release branch 4.7 to 4.8 * 4.7: Revert "Merge pull request #1482 from remibergsma/iptables-fix"
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/091ca567 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/091ca567 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/091ca567 Branch: refs/heads/4.8 Commit: 091ca567f0d8ac822002820a365f341464de3b4b Parents: e43a4eb 74f60df Author: Will Stevens <[email protected]> Authored: Thu May 19 12:03:38 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Thu May 19 12:03:38 2016 -0400 ---------------------------------------------------------------------- .../debian/config/opt/cloud/bin/configure.py | 39 ++-- .../debian/config/opt/cloud/bin/cs/CsAddress.py | 31 +-- .../debian/config/opt/cloud/bin/cs/CsDhcp.py | 2 +- .../config/opt/cloud/bin/cs/CsLoadBalancer.py | 10 +- .../config/opt/cloud/bin/cs/CsNetfilter.py | 72 +++--- .../config/opt/cloud/bin/cs_iptables_save.py | 227 ------------------- 6 files changed, 69 insertions(+), 312 deletions(-) ----------------------------------------------------------------------
