Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bdc411f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bdc411f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bdc411f Branch: refs/heads/master Commit: 6bdc411ff2eca4c4f4471c5415a5de085124a5cc Parents: 70c79ad 2e5373b Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Dec 8 00:04:26 2016 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Dec 8 00:04:26 2016 +0530 ---------------------------------------------------------------------- .../facade/IpAssociationConfigItem.java | 4 +- .../virtualnetwork/model/IpAddress.java | 4 +- .../virtualnetwork/ConfigHelperTest.java | 15 +- .../Ovm3VirtualRoutingResourceTest.java | 2 + .../debian/config/opt/cloud/bin/configure.py | 6 + .../debian/config/opt/cloud/bin/cs/CsAddress.py | 75 +- .../debian/config/opt/cloud/bin/cs/CsRoute.py | 25 +- .../debian/config/opt/cloud/bin/cs/CsRule.py | 18 + .../debian/config/opt/cloud/bin/cs_ip.py | 11 +- .../test_multiple_public_interfaces.py | 1312 ++++++++++++++++++ 10 files changed, 1432 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
