Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B4738E82C for ; Fri, 8 Mar 2013 19:37:49 +0000 (UTC) Received: (qmail 75552 invoked by uid 500); 8 Mar 2013 19:37:49 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 75533 invoked by uid 500); 8 Mar 2013 19:37:49 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 75522 invoked by uid 99); 8 Mar 2013 19:37:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 19:37:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DE90509D; Fri, 8 Mar 2013 19:37:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [38/38] git commit: refs/heads/ui-multiple-nics - Merge branch 'master' into ui-multiple-nics Message-Id: <20130308193749.3DE90509D@tyr.zones.apache.org> Date: Fri, 8 Mar 2013 19:37:49 +0000 (UTC) Updated Branches: refs/heads/ui-multiple-nics 53c589a62 -> a9387dfc5 Merge branch 'master' into ui-multiple-nics Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a9387dfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a9387dfc Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a9387dfc Branch: refs/heads/ui-multiple-nics Commit: a9387dfc588297f6f1a0ed29355808dfa7c8d7f2 Parents: 53c589a ee22753 Author: Brian Federle Authored: Fri Mar 8 11:37:33 2013 -0800 Committer: Brian Federle Committed: Fri Mar 8 11:37:33 2013 -0800 ---------------------------------------------------------------------- api/src/com/cloud/alert/Alert.java | 1 + api/src/com/cloud/event/Event.java | 1 + api/src/com/cloud/network/Network.java | 1 - api/src/com/cloud/server/ManagementService.java | 38 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../command/admin/account/CreateAccountCmd.java | 4 +- .../command/admin/account/DeleteAccountCmd.java | 4 +- .../command/admin/account/DisableAccountCmd.java | 2 +- .../command/admin/account/EnableAccountCmd.java | 3 +- .../command/admin/account/UpdateAccountCmd.java | 3 +- .../api/command/admin/domain/DeleteDomainCmd.java | 2 +- .../api/command/admin/domain/UpdateDomainCmd.java | 4 +- .../api/command/admin/user/DeleteUserCmd.java | 2 +- .../api/command/admin/user/DisableUserCmd.java | 4 +- .../api/command/admin/user/EnableUserCmd.java | 4 +- .../api/command/admin/user/UpdateUserCmd.java | 4 +- .../apache/cloudstack/region/RegionService.java | 136 ++-- client/tomcatconf/commands.properties.in | 4 + .../virtualnetwork/VirtualRoutingResource.java | 48 +- core/src/com/cloud/alert/AlertVO.java | 38 +- core/src/com/cloud/event/EventVO.java | 167 +++--- core/src/com/cloud/event/dao/EventDao.java | 5 + core/src/com/cloud/event/dao/EventDaoImpl.java | 71 ++- .../src/com/cloud/storage/StoragePoolDetailVO.java | 81 --- core/src/com/cloud/user/AccountVO.java | 40 +- core/src/com/cloud/user/UserVO.java | 23 +- debian/cloudstack-agent.install | 1 + debian/control | 2 +- debian/rules | 134 ++-- docs/en-US/advanced-zone-guest-ip-addresses.xml | 12 +- docs/en-US/build-deb.xml | 2 +- docs/en-US/build-rpm.xml | 146 ++-- docs/en-US/getting-release.xml | 40 +- docs/en-US/globally-configured-limits.xml | 2 +- docs/en-US/guest-traffic.xml | 9 +- docs/en-US/networks.xml | 1 + docs/en-US/reserved-ip-addresses-non-csvms.xml | 163 +++++ docs/en-US/source-prereqs.xml | 13 +- docs/en-US/source.xml | 18 +- docs/en-US/verifying-source.xml | 2 +- docs/en-US/working-with-snapshots.xml | 4 + docs/en-US/working-with-usage-data.xml | 1 + docs/pot/build-deb.pot | 2 +- .../storage/datastore/db/PrimaryDataStoreDao.java | 148 ++-- .../datastore/db/PrimaryDataStoreDaoImpl.java | 544 ++++++++------- .../storage/datastore/db/StoragePoolDetailVO.java | 81 +++ .../datastore/db/StoragePoolDetailsDao.java | 28 + .../storage/datastore/db/StoragePoolVO.java | 9 +- .../cloud/entity/api/VMEntityManagerImpl.java | 4 +- .../storage/allocator/StorageAllocatorTest.java | 8 +- .../StorageAllocatorTestConfiguration.java | 4 +- .../snapshot/strategy/AncientSnasphotStrategy.java | 4 +- .../allocator/AbstractStoragePoolAllocator.java | 4 +- .../allocator/ZoneWideStoragePoolAllocator.java | 4 +- .../AncientPrimaryDataStoreLifeCycleImpl.java | 2 +- packaging/centos63/cloud-agent.rc | 3 +- packaging/centos63/cloud.spec | 3 + packaging/debian/init/cloud-agent | 5 +- .../debian/config/etc/init.d/cloud-early-config | 19 +- .../cloud/hypervisor/kvm/resource/KVMHABase.java | 6 +- .../kvm/resource/LibvirtComputingResource.java | 249 +++----- .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +- .../hypervisor/kvm/resource/LibvirtXMLParser.java | 8 +- pom.xml | 3 +- scripts/vm/hypervisor/kvm/patchviasocket.pl | 58 ++ scripts/vm/hypervisor/kvm/rundomrpre.sh | 147 ---- .../com/cloud/agent/manager/AgentManagerImpl.java | 4 +- .../allocator/impl/RecreateHostAllocator.java | 4 +- server/src/com/cloud/alert/dao/AlertDao.java | 7 + server/src/com/cloud/alert/dao/AlertDaoImpl.java | 85 +++ server/src/com/cloud/api/ApiDBUtils.java | 5 +- server/src/com/cloud/api/ApiDispatcher.java | 6 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 3 + .../api/query/dao/DomainRouterJoinDaoImpl.java | 23 + server/src/com/cloud/api/query/vo/EventJoinVO.java | 9 + .../com/cloud/capacity/dao/CapacityDaoImpl.java | 4 +- server/src/com/cloud/configuration/Config.java | 5 +- .../configuration/ConfigurationManagerImpl.java | 2 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 4 +- server/src/com/cloud/deploy/FirstFitPlanner.java | 4 +- server/src/com/cloud/ha/RecreatableFencer.java | 4 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 9 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 1 - .../src/com/cloud/projects/ProjectManagerImpl.java | 2 +- .../com/cloud/resource/ResourceManagerImpl.java | 4 +- .../resourcelimit/ResourceLimitManagerImpl.java | 2 +- .../com/cloud/server/ConfigurationServerImpl.java | 33 +- .../src/com/cloud/server/ManagementServerImpl.java | 113 +++- .../cloud/storage/LocalStoragePoolListener.java | 4 +- server/src/com/cloud/storage/OCFS2ManagerImpl.java | 4 +- .../src/com/cloud/storage/StorageManagerImpl.java | 2 +- .../src/com/cloud/storage/VolumeManagerImpl.java | 4 +- .../src/com/cloud/storage/dao/StoragePoolDao.java | 113 --- .../com/cloud/storage/dao/StoragePoolDaoImpl.java | 432 ------------ .../cloud/storage/dao/StoragePoolDetailsDao.java | 28 - .../storage/dao/StoragePoolDetailsDaoImpl.java | 3 +- .../cloud/storage/listener/StoragePoolMonitor.java | 4 +- .../storage/snapshot/SnapshotManagerImpl.java | 4 +- .../com/cloud/template/TemplateManagerImpl.java | 4 +- server/src/com/cloud/user/AccountManager.java | 14 +- server/src/com/cloud/user/AccountManagerImpl.java | 71 ++- server/src/com/cloud/user/DomainManagerImpl.java | 9 +- server/src/com/cloud/user/dao/AccountDaoImpl.java | 90 ++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 4 +- .../apache/cloudstack/region/RegionManager.java | 94 +++ .../cloudstack/region/RegionManagerImpl.java | 432 +++++++++++- .../cloudstack/region/RegionServiceImpl.java | 72 +-- .../apache/cloudstack/region/RegionsApiUtil.java | 306 ++++++++ .../cloudstack/region/dao/RegionSyncDao.java | 24 - .../cloudstack/region/dao/RegionSyncDaoImpl.java | 35 - .../com/cloud/storage/dao/StoragePoolDaoTest.java | 3 +- .../dao/StoragePoolDaoTestConfiguration.java | 3 +- .../com/cloud/user/MockAccountManagerImpl.java | 3 +- .../cloud/vm/snapshot/VMSnapshotManagerTest.java | 4 +- .../cloudstack/region/RegionManagerTest.java | 35 +- .../ConsoleProxyHttpHandlerHelper.java | 7 +- setup/db/db/schema-40to410.sql | 1 + setup/db/db/schema-410to420.sql | 45 ++ .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate/zerodisk.sh | 1 + ui/scripts/docs.js | 9 + ui/scripts/globalSettings.js | 2 +- ui/scripts/system.js | 13 +- .../cloud/utils/component/ComponentContext.java | 4 - .../cloud/utils/db/TransactionContextBuilder.java | 20 +- .../cloud/hypervisor/vmware/util/VmwareClient.java | 25 +- 128 files changed, 2770 insertions(+), 2094 deletions(-) ----------------------------------------------------------------------