From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 23 Oct 2013 06:06:16 +0000 (+0000)
Subject: Merge "Remove duplication of brick.iscsi in brick.iser"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5168751ffdc52fd694bee7327b8be8d0fddd3cd7;p=openstack-build%2Fcinder-build.git

Merge "Remove duplication of brick.iscsi in brick.iser"
---

5168751ffdc52fd694bee7327b8be8d0fddd3cd7
diff --cc cinder/volume/driver.py
index c04c03207,64b958e1f..226fbef20
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@@ -25,8 -25,8 +25,7 @@@ import tim
  
  from oslo.config import cfg
  
 -from cinder.brick.initiator import connector as initiator
  from cinder.brick.iscsi import iscsi
- from cinder.brick.iser import iser
  from cinder import exception
  from cinder.image import image_utils
  from cinder.openstack.common import excutils