Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e218a6dc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e218a6dc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e218a6dc Branch: refs/heads/disk_io_throttling Commit: e218a6dcfd8ce514ff04df0631ea5fa6ac31cf8b Parents: 5dc7387 195e823 Author: Sateesh Chodapuneedi <sate...@apache.org> Authored: Fri Jun 7 17:08:23 2013 +0530 Committer: Sateesh Chodapuneedi <sate...@apache.org> Committed: Fri Jun 7 17:08:23 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_vm_life_cycle.py | 9 +++++++++ 1 file changed, 9 insertions(+) ----------------------------------------------------------------------