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/34242126 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/34242126 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/34242126 Branch: refs/heads/vim51_win8 Commit: 3424212638a8365fd8f9a4580b038779e9bfb438 Parents: bf9ff8c 310e990 Author: Sebastien Goasguen <[email protected]> Authored: Mon Feb 25 14:06:55 2013 -0500 Committer: Sebastien Goasguen <[email protected]> Committed: Mon Feb 25 14:06:55 2013 -0500 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 1 + api/src/com/cloud/network/vpc/VpcService.java | 2 +- .../apache/cloudstack/api/ServerApiException.java | 11 +- .../command/admin/vpc/CreateVPCOfferingCmd.java | 31 +++- debian/control | 2 +- developer/pom.xml | 28 +-- packaging/centos63/cloud.spec | 2 +- python/lib/cloudutils/utilities.py | 9 +- scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 46 +++- server/src/com/cloud/configuration/Config.java | 1 + .../network/element/VpcVirtualRouterElement.java | 4 +- server/src/com/cloud/network/vpc/VpcManager.java | 3 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 193 +++++++++++---- .../src/com/cloud/network/vpc/VpcServiceMapVO.java | 90 +++++++ server/src/com/cloud/network/vpc/dao/VpcDao.java | 5 + .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 27 ++ .../cloud/network/vpc/dao/VpcServiceMapDao.java | 40 +++ .../network/vpc/dao/VpcServiceMapDaoImpl.java | 115 +++++++++ .../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 +++-- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 14 + server/src/com/cloud/vm/UserVmManagerImpl.java | 61 ++++- server/src/com/cloud/vm/dao/UserVmDao.java | 2 + server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 35 ++- server/src/com/cloud/vm/dao/VMInstanceDao.java | 3 +- server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 14 +- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 12 +- server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 13 +- setup/db/db/schema-410to420.sql | 15 ++ test/integration/smoke/test_vm_life_cycle.py | 6 - utils/src/com/cloud/utils/script/Script.java | 6 + 34 files changed, 725 insertions(+), 175 deletions(-) ----------------------------------------------------------------------
