Merge branch 'master' 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/6d6e790d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d6e790d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d6e790d Branch: refs/heads/resize-root Commit: 6d6e790d814e8f63fe2d712d11268f94ee5e4d69 Parents: e42502a d033ca4 Author: Marcus Sorensen <[email protected]> Authored: Mon Mar 10 15:37:08 2014 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Mon Mar 10 15:37:08 2014 -0600 ---------------------------------------------------------------------- .../SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +- .../SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +- .../sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 2 +- .../sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +- api/src/com/cloud/event/EventTypes.java | 5 + .../VpcVirtualNetworkApplianceService.java | 8 +- core/src/com/cloud/info/ConsoleProxyInfo.java | 19 +- .../engine/orchestration/CloudOrchestrator.java | 2 +- .../storage/image/TemplateServiceImpl.java | 13 +- packaging/centos63/cloud-agent.rc | 2 +- packaging/centos63/cloud-ipallocator.rc | 2 +- .../src/com/cloud/hypervisor/XenServerGuru.java | 33 +- .../driver/CloudStackImageStoreDriverImpl.java | 12 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +- .../SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +- .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 2 +- .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +- .../SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +- server/src/com/cloud/api/ApiDispatcher.java | 7 + server/src/com/cloud/api/ApiServer.java | 11 +- .../dispatch/ParamGenericValidationWorker.java | 4 +- server/src/com/cloud/configuration/Config.java | 4 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 11 +- .../src/com/cloud/event/ActionEventUtils.java | 12 +- .../com/cloud/network/IpAddressManagerImpl.java | 4 +- .../src/com/cloud/network/NetworkModelImpl.java | 14 +- .../element/VpcVirtualRouterElement.java | 14 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 34 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 4 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 1 - .../cloud/network/vpc/VpcManagerImplTest.java | 66 +++ .../MockVpcVirtualNetworkApplianceManager.java | 7 +- .../SecondaryStorageManagerImpl.java | 7 + setup/db/db/schema-421to430.sql | 4 + systemvm/conf/consoleproxy.properties | 2 +- .../rc.d/init.d/cloud-console-proxy.in | 2 +- .../rc.d/init.d/cloud-console-proxy.in | 2 +- .../rc.d/init.d/cloud-console-proxy.in | 2 +- .../SYSCONFDIR/init.d/cloud-console-proxy.in | 2 +- .../component/test_cpu_domain_limits.py | 11 +- test/integration/component/test_cpu_limits.py | 15 +- .../component/test_cpu_project_limits.py | 7 +- .../component/test_dynamic_compute_offering.py | 409 +++++++++++++++++++ .../integration/component/test_memory_limits.py | 15 +- .../component/test_mm_domain_limits.py | 7 +- .../component/test_mm_project_limits.py | 7 +- test/integration/component/test_routers.py | 28 +- .../component/test_vpc_vm_life_cycle.py | 108 +---- tools/marvin/marvin/codes.py | 1 + tools/marvin/marvin/integration/lib/base.py | 29 +- tools/marvin/marvin/integration/lib/common.py | 39 +- tools/marvin/marvin/integration/lib/utils.py | 3 +- ui/css/cloudstack3.css | 2 +- 55 files changed, 797 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d6e790d/server/src/com/cloud/vm/UserVmManagerImpl.java ----------------------------------------------------------------------
