You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/28 22:05:44 UTC
[2/2] git commit: updated refs/heads/master to 12d8e53
Merge pull request #1454 from shapeblue/host-maint
CLOUDSTACK-9323: Fix cancel host maintenance canFix cancel host maintenance so that if maintenance is cancelled the host come back to normal state gracefully.
Added marvin tests for host maintennace.
* pr/1454:
CLOUDSTACK-9323: Fix Cancel maintenance so that if maintenance is cancelled the host come back to normal state gracefully. Added marvin tests for host maintennace.
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12d8e53d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12d8e53d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12d8e53d
Branch: refs/heads/master
Commit: 12d8e53dd54d83242b3dabf2151249ab7963d5a8
Parents: a5ee443 182ab64
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 28 16:05:10 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 28 16:05:10 2016 -0400
----------------------------------------------------------------------
.../com/cloud/resource/ResourceManagerImpl.java | 10 +-
.../component/test_host_maintenance.py | 292 +++++++++++++++++++
tools/marvin/marvin/lib/utils.py | 23 +-
3 files changed, 320 insertions(+), 5 deletions(-)
----------------------------------------------------------------------