Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 217BE102A9 for ; Thu, 25 Apr 2013 18:08:22 +0000 (UTC) Received: (qmail 3810 invoked by uid 500); 25 Apr 2013 18:08:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3742 invoked by uid 500); 25 Apr 2013 18:08:19 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 3528 invoked by uid 99); 25 Apr 2013 18:08:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Apr 2013 18:08:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 51DF18814D6; Thu, 25 Apr 2013 18:08:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 25 Apr 2013 18:08:25 -0000 Message-Id: In-Reply-To: <6c10bba7a2ec4acbabf177aa8e061bbb@git.apache.org> References: <6c10bba7a2ec4acbabf177aa8e061bbb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/43] git commit: updated refs/heads/master to 5ce2890 Merge branch 'master' into ui-vm-affinity Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6629eb74 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6629eb74 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6629eb74 Branch: refs/heads/master Commit: 6629eb7468eef95cbe9afc62db99649cb0e571e4 Parents: 96999be 95cbb79 Author: Brian Federle Authored: Fri Apr 12 10:37:18 2013 -0700 Committer: Brian Federle Committed: Fri Apr 12 10:37:18 2013 -0700 ---------------------------------------------------------------------- .../command/admin/cluster/UpdateClusterCmd.java | 15 +++- .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 + .../api/response/GlobalLoadBalancerResponse.java | 8 +++ core/src/com/cloud/vm/VmDetailConstants.java | 1 + .../cloudstack/storage/test/DirectAgentTest.java | 4 +- .../command/CreateVolumeFromBaseImageCommand.java | 6 +- .../provider/DataStoreProviderManagerImpl.java | 4 +- .../storage/to/ImageOnPrimaryDataStoreTO.java | 44 +++++++++++++ .../storage/to/ImageOnPrimayDataStoreTO.java | 44 ------------- .../affinity/HostAntiAffinityProcessor.java | 50 ++++++++------- .../cloudstack/syslog/AlertsSyslogAppender.java | 4 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 19 +++++- .../hypervisor/vmware/resource/VmwareResource.java | 18 +++++ .../xen/resource/XenServerStorageResource.java | 4 +- server/pom.xml | 2 - server/src/com/cloud/api/ApiResponseHelper.java | 2 + .../src/com/cloud/api/query/QueryManagerImpl.java | 6 ++- server/src/com/cloud/configuration/Config.java | 1 + server/src/com/cloud/network/NetworkModelImpl.java | 26 ++++++-- .../com/cloud/resource/ResourceManagerImpl.java | 22 ++----- .../affinity/dao/AffinityGroupVMMapDao.java | 2 +- .../affinity/dao/AffinityGroupVMMapDaoImpl.java | 4 +- .../affinity/AffinityApiTestConfiguration.java | 18 +++++- .../cloudstack/affinity/AffinityApiUnitTest.java | 21 +++++- .../networkoffering/ChildTestConfiguration.java | 7 ++- .../networkoffering/CreateNetworkOfferingTest.java | 1 - test/integration/smoke/test_ScaleVm.py | 4 +- tools/build/build_docs.sh | 12 +++- ui/scripts/regions.js | 24 ++++++- 29 files changed, 247 insertions(+), 129 deletions(-) ----------------------------------------------------------------------