Merge branch '4.2' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5bacfd5a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5bacfd5a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5bacfd5a Branch: refs/heads/4.2 Commit: 5bacfd5a9e85c270535efd2af0379c33893cf9cd Parents: a1df211 a505b5b Author: Pranav Saxena <psb...@gmail.com> Authored: Tue Jul 9 10:25:29 2013 +0530 Committer: Pranav Saxena <psb...@gmail.com> Committed: Tue Jul 9 10:25:29 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
