From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 15 Nov 2012 21:55:26 +0000 (+0000)
Subject: Merge "Various pep8/HACKING fixes for Cinder."
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=69ae5c145fd892b60922ae31b1c222c6f7ebe9ef;p=openstack-build%2Fcinder-build.git

Merge "Various pep8/HACKING fixes for Cinder."
---

69ae5c145fd892b60922ae31b1c222c6f7ebe9ef
diff --cc bin/cinder-manage
index 19bb1d6ea,fb4b46a83..cfd0c7621
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@@ -58,11 -58,10 +58,11 @@@ import gettex
  import optparse
  import os
  import sys
 +import uuid
  
  from sqlalchemy import create_engine, MetaData, Table
- from sqlalchemy.orm import sessionmaker
  from sqlalchemy.ext.declarative import declarative_base
+ from sqlalchemy.orm import sessionmaker
  
  
  # If ../cinder/__init__.py exists, add ../ to Python search path, so that