You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/25 20:08:25 UTC
[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 <br...@citrix.com>
Authored: Fri Apr 12 10:37:18 2013 -0700
Committer: Brian Federle <br...@citrix.com>
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(-)
----------------------------------------------------------------------