Merge "Purge deleted rows"

diff --cc cinder/cmd/manage.py
Simple merge

diff --cc cinder/db/api.py
Simple merge

diff --cc cinder/db/sqlalchemy/api.py
index 2d607a902ba40a3030b23e57f567f264e9a96ecc,cbc0f7e15db188ac58d52b7ee93296bf51e12ad8..2ad9f744ccb48a75e78f24270cf60ffd783f64a2
--- 1/cinder/db/sqlalchemy/api.py
--- 2/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