Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6b257bf6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6b257bf6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6b257bf6 Branch: refs/heads/ui-multiple-nics Commit: 6b257bf6611c537cf757a928d131ee7f194bb9fe Parents: fc64ee5 e0019ec Author: Pranav Saxena <[email protected]> Authored: Mon Mar 4 14:51:39 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Mon Mar 4 14:51:39 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/event/EventTypes.java | 1 + api/src/com/cloud/vm/UserVmService.java | 16 +- api/src/com/cloud/vm/VirtualMachine.java | 11 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 109 +++++ client/tomcatconf/commands.properties.in | 1 + core/src/com/cloud/vm/VMInstanceVO.java | 26 ++- .../xen/resource/CitrixResourceBase.java | 172 ++++----- .../xen/resource/XenServer56FP1Resource.java | 11 +- .../xenserver/Add-To-VCPUs-Params-Live.sh | 33 ++ scripts/vm/hypervisor/xenserver/vmops | 13 + server/src/com/cloud/configuration/Config.java | 3 +- .../src/com/cloud/server/ManagementServerImpl.java | 1 + server/src/com/cloud/vm/ItWorkVO.java | 3 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 86 ++++- server/src/com/cloud/vm/VirtualMachineManager.java | 12 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 307 +++++++++++++-- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 17 +- .../cloud/vm/MockVirtualMachineManagerImpl.java | 15 + 18 files changed, 676 insertions(+), 161 deletions(-) ----------------------------------------------------------------------
