From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 16 Mar 2015 18:33:40 +0000 (+0000)
Subject: Merge "Error trying to delete snapshots on Hitachi driver"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7ce54802fcba0590238ccf60d1f91f9f7dd4f4dc;p=openstack-build%2Fcinder-build.git

Merge "Error trying to delete snapshots on Hitachi driver"
---

7ce54802fcba0590238ccf60d1f91f9f7dd4f4dc
diff --cc cinder/volume/drivers/hitachi/hbsd_common.py
index 0e2444dac,6899e2564..cfcfb7e60
--- a/cinder/volume/drivers/hitachi/hbsd_common.py
+++ b/cinder/volume/drivers/hitachi/hbsd_common.py
@@@ -24,10 -23,9 +24,8 @@@ from oslo_log import log as loggin
  from oslo_utils import excutils
  import six
  
- from cinder.db.sqlalchemy import api
- from cinder.db.sqlalchemy import models
  from cinder import exception
  from cinder.i18n import _LE, _LW
 -from cinder.openstack.common import log as logging
  from cinder import utils
  from cinder.volume.drivers.hitachi import hbsd_basiclib as basic_lib
  from cinder.volume.drivers.hitachi import hbsd_horcm as horcm