You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/11/11 17:16:05 UTC
[1/2] git commit: updated refs/heads/4.4 to 713a359
Repository: cloudstack
Updated Branches:
refs/heads/4.4 379955837 -> 713a3590b
CLOUDSTACK-7883: Allow infrastructure to handle delete of volume from DB
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5854615
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5854615
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5854615
Branch: refs/heads/4.4
Commit: c58546158e2c69158364df9a0caf18ec437687b5
Parents: 70cfbd3
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Tue Nov 11 08:59:06 2014 -0700
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Tue Nov 11 08:59:06 2014 -0700
----------------------------------------------------------------------
.../storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5854615/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java
index 014413d..94ae0da 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java
@@ -785,8 +785,6 @@ public class SolidfirePrimaryDataStoreDriver implements PrimaryDataStoreDriver {
SolidFireUtil.SolidFireVolume sfVolume = deleteSolidFireVolume(volumeInfo, sfConnection);
- _volumeDao.deleteVolumesByInstance(volumeInfo.getId());
-
// if (!sfAccountHasVolume(sfAccountId, sfConnection)) {
// // delete the account from the SolidFire SAN
// deleteSolidFireAccount(sfAccountId, sfConnection);
[2/2] git commit: updated refs/heads/4.4 to 713a359
Posted by da...@apache.org.
Merge remote-tracking branch 'origin/hotfix/4.4/CLOUDSTACK-7883' into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/713a3590
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/713a3590
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/713a3590
Branch: refs/heads/4.4
Commit: 713a3590b63dc74dc9500ec48afad8ed87ac1cbf
Parents: 3799558 c585461
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Nov 11 17:15:50 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Nov 11 17:15:50 2014 +0100
----------------------------------------------------------------------
.../storage/datastore/driver/SolidfirePrimaryDataStoreDriver.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------