You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2015/08/11 03:01:12 UTC
[2/2] git commit: updated refs/heads/master to 8b0266d
Merge branch 'pr/547'
* pr/547:
CLOUDSTACK-8601. VMFS storage added as local storage can be re-added as shared storage. Fail addition of a VMFS shared storage pool in case it has already been added as local storage in CS.
Signed-off-by: Mike Tutkowski <mi...@solidfire.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b0266d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b0266d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b0266d1
Branch: refs/heads/master
Commit: 8b0266d12e64c229e16dd142ad8a056a42c5c625
Parents: cd02a59 13a98dd
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Mon Aug 10 18:56:39 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Mon Aug 10 19:00:53 2015 -0600
----------------------------------------------------------------------
.../exception/StorageConflictException.java | 27 ++++++++++++++++++++
.../agent/api/ModifyStoragePoolAnswer.java | 9 +++++++
.../api/storage/HypervisorHostListener.java | 4 ++-
.../datastore/db/PrimaryDataStoreDao.java | 2 ++
.../datastore/db/PrimaryDataStoreDaoImpl.java | 16 ++++++++++++
.../datastore/provider/DefaultHostListener.java | 16 +++++++++++-
.../vmware/resource/VmwareResource.java | 3 +++
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 7 +++++
.../src/com/cloud/storage/StorageManager.java | 3 ++-
.../com/cloud/storage/StorageManagerImpl.java | 3 ++-
.../utils/exception/CSExceptionErrorCode.java | 1 +
11 files changed, 87 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b0266d1/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b0266d1/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------