[2/2] git commit: updated refs/heads/master to 39c825c

[re...@apache.org]

Merge pull request #968 from mike-tutkowski/removed_column

CLOUDSTACK-8985: Deleted volume's removed column not updatedI found this issue when a SolidFire integration test yesterday wasn't able to delete primary storage because it claimed there were still volumes using the primary storage in question (this was due to the removed column not being updated appropriately).

I decided to go with a solution where the delete logic would pass in a volume ID to ignore when computing the used space of the primary storage in question.

* pr/968:
  CLOUDSTACK-8985: Deleted volume's removed column not updated

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/39c825c2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39c825c2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39c825c2

Branch: refs/heads/master
Commit: 39c825c2c5e42a2805fb7dfcac2055d8c1edfd79
Parents: 7d46b2e 7d1dc97
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Oct 28 11:39:05 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Oct 28 11:39:05 2015 +0100

----------------------------------------------------------------------
 .../driver/SolidFirePrimaryDataStoreDriver.java | 31 ++++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------