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/1d9735c3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1d9735c3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1d9735c3 Branch: refs/heads/4.9-bountycastle-daan Commit: 1d9735c346f01f299c36fb2101ef5f50286c7113 Parents: 12e698d 3e6f49d Author: Rohit Yadav <[email protected]> Authored: Tue Aug 30 22:44:33 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Tue Aug 30 22:44:33 2016 +0530 ---------------------------------------------------------------------- .../debian/config/opt/cloud/bin/cs/CsAddress.py | 24 +- test/integration/smoke/test_router_dns.py | 268 +++++++++++++++++++ tools/marvin/marvin/sshClient.py | 3 +- tools/marvin/setup.py | 1 + 4 files changed, 282 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d9735c3/tools/marvin/setup.py ----------------------------------------------------------------------
