Merge remote-tracking branch 'origin/hotfix/4.4/CLOUDSTACK-7883' into 4.4

This commit is contained in:
Daan Hoogland 2014-11-11 17:15:50 +01:00
commit 713a3590b6
1 changed files with 0 additions and 2 deletions

View File

@ -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);