Merge branch '4.5'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63ff683b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63ff683b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63ff683b Branch: refs/heads/master Commit: 63ff683b89f579478777c8ef1944f9bd54b80e75 Parents: 4bfb7f2 b3faab6 Author: SrikanteswaraRao Talluri <[email protected]> Authored: Thu Nov 13 18:30:12 2014 +0530 Committer: SrikanteswaraRao Talluri <[email protected]> Committed: Thu Nov 13 18:30:12 2014 +0530 ---------------------------------------------------------------------- .../component/test_dynamic_compute_offering.py | 17 ++++ test/integration/smoke/test_scale_vm.py | 86 +++++++++++++------- 2 files changed, 75 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63ff683b/test/integration/component/test_dynamic_compute_offering.py ----------------------------------------------------------------------
