Merge branch 'master' into qemu-img
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1fa7b04e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1fa7b04e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1fa7b04e Branch: refs/heads/qemu-img Commit: 1fa7b04ec5115f93ec58a79747a8c396b99f35e6 Parents: c08e1bd 4d573dd Author: Wido den Hollander <[email protected]> Authored: Mon Feb 25 12:54:31 2013 +0100 Committer: Wido den Hollander <[email protected]> Committed: Mon Feb 25 12:54:31 2013 +0100 ---------------------------------------------------------------------- api/src/com/cloud/resource/ResourceService.java | 2 +- .../apache/cloudstack/api/ServerApiException.java | 11 ++- .../api/command/user/vm/DeployVMCmd.java | 7 - .../user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +- debian/control | 2 +- developer/pom.xml | 4 + docs/en-US/images/resize-volume-icon.png | Bin 0 -> 857 bytes docs/en-US/images/resize-volume.png | Bin 0 -> 11995 bytes docs/en-US/resizing-volumes.xml | 92 ++++++++++++--- packaging/centos63/cloud.spec | 2 +- .../kvm/resource/LibvirtComputingResource.java | 10 +- python/lib/cloudutils/utilities.py | 9 ++- .../com/cloud/resource/ResourceManagerImpl.java | 38 ++++++- .../cloud/storage/dao/VMTemplateHostDaoImpl.java | 1 - .../storage/download/DownloadMonitorImpl.java | 28 +++-- .../cloud/template/HyervisorTemplateAdapter.java | 21 ++-- .../com/cloud/template/TemplateAdapterBase.java | 2 + .../com/cloud/template/TemplateManagerImpl.java | 57 +++++---- server/src/com/cloud/upgrade/DatabaseCreator.java | 16 +++- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 10 +- .../src/com/cloud/upgrade/dao/VersionDaoImpl.java | 2 +- server/src/com/cloud/vm/dao/UserVmDao.java | 2 + server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 35 ++++-- .../com/cloud/capacity/CapacityManagerTest.java | 19 +++- .../cloud/resource/MockResourceManagerImpl.java | 3 + setup/db/db/schema-40to410.sql | 3 + setup/db/db/schema-410to420.sql | 4 + setup/db/templates.sql | 33 +++--- test/integration/smoke/test_vm_life_cycle.py | 6 - tools/pom.xml | 2 +- ui/scripts/instances.js | 21 ++++ utils/src/com/cloud/utils/script/Script.java | 6 + 32 files changed, 324 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1fa7b04e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1fa7b04e/utils/src/com/cloud/utils/script/Script.java ----------------------------------------------------------------------
