From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 5 Feb 2015 06:22:14 +0000 (+0000)
Subject: Merge "Purge deleted rows"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=eca458e00049b15b6a967346f06dc7976a98487e;p=openstack-build%2Fcinder-build.git

Merge "Purge deleted rows"
---

eca458e00049b15b6a967346f06dc7976a98487e
diff --cc cinder/db/sqlalchemy/api.py
index 2d607a902,cbc0f7e15..2ad9f744c
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@@ -45,8 -48,9 +49,8 @@@ from sqlalchemy.sql import fun
  from cinder.common import sqlalchemyutils
  from cinder.db.sqlalchemy import models
  from cinder import exception
- from cinder.i18n import _, _LW
+ from cinder.i18n import _, _LW, _LE, _LI
  from cinder.openstack.common import log as logging
 -from cinder.openstack.common import uuidutils
  
  
  CONF = cfg.CONF