Repository: cloudstack Updated Branches: refs/heads/resize-root c02c63494 -> 71a5bd29e
Merge branch '4.4' into resize-root Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71a5bd29 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71a5bd29 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71a5bd29 Branch: refs/heads/resize-root Commit: 71a5bd29eabf54c88ae4b50e583dd8d3d5973344 Parents: c02c634 709d2a0 Author: Marcus Sorensen <[email protected]> Authored: Fri Mar 14 03:38:07 2014 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Fri Mar 14 03:38:07 2014 -0600 ---------------------------------------------------------------------- .../api/command/user/vm/DeployVMCmd.java | 61 +++++++++++--------- .../src/com/cloud/vm/VirtualMachineManager.java | 3 +- .../service/VolumeOrchestrationService.java | 2 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 18 +++--- .../engine/orchestration/CloudOrchestrator.java | 50 ++++++++++++---- .../orchestration/VolumeOrchestrator.java | 11 ++-- ui/css/cloudstack3.css | 40 +++++++++++++ ui/index.jsp | 13 ++++- ui/scripts/instanceWizard.js | 19 ++++++ ui/scripts/ui-custom/instanceWizard.js | 10 +++- 10 files changed, 172 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71a5bd29/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71a5bd29/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java ----------------------------------------------------------------------
