Merge branch '4.5' * 4.5: CLOUDSTACK-7885 : Fixed the script '/maint/test_vpc_host_maintenance.py' CLOUDSTACK-7860: test_eip_elb.py - Move Netscler info out of the test case. Read it from config. Fix attribute error. Fix pep8 issues. Fix imports.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0fd54755 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fd54755 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fd54755 Branch: refs/heads/master Commit: 0fd5475593a29862587d73eabecf4e718f0bc5b8 Parents: a60b729 f92fa42 Author: SrikanteswaraRao Talluri <[email protected]> Authored: Fri Nov 14 16:49:51 2014 +0530 Committer: SrikanteswaraRao Talluri <[email protected]> Committed: Fri Nov 14 16:49:51 2014 +0530 ---------------------------------------------------------------------- .../maint/test_vpc_host_maintenance.py | 106 +- test/integration/component/test_eip_elb.py | 1518 +++++++++--------- 2 files changed, 867 insertions(+), 757 deletions(-) ----------------------------------------------------------------------
