Merge remote-tracking branch 'origin/hotfix/4.4/CLOUDSTACK-6099' into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01527635 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01527635 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01527635 Branch: refs/heads/hotfix/4.4/CLOUDSTACK-7184 Commit: 015276350e41b30bde049ca0852811ed6262da16 Parents: 3a0f155 56c7fc8 Author: Daan Hoogland <d...@onecht.net> Authored: Wed Sep 10 13:59:14 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Wed Sep 10 13:59:14 2014 +0200 ---------------------------------------------------------------------- .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
