From: Deepak N <deepak.n@thoughtworks.com>
Date: Wed, 10 Aug 2011 04:58:15 +0000 (+0530)
Subject: Merged quantum trunk
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=042cf509b316767f862eb7988d972bc26abfe68b;p=openstack-build%2Fneutron-build.git

Merged quantum trunk
---

042cf509b316767f862eb7988d972bc26abfe68b
diff --cc quantum/db/api.py
index 2b7167ba8,436df8415..8153bd9da
--- a/quantum/db/api.py
+++ b/quantum/db/api.py
@@@ -20,10 -20,9 +20,10 @@@
  from sqlalchemy import create_engine
  from sqlalchemy.orm import sessionmaker, exc
  
- 
+ from quantum.common import exceptions as q_exc
  from quantum.db import models
  
 +
  _ENGINE = None
  _MAKER = None
  BASE = models.BASE
diff --cc tools/pip-requires
index baf065da2,fc1b29f9f..31b66c77f
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@@ -3,9 -3,9 +3,9 @@@ Routes>=1.12.
  nose
  Paste
  PasteDeploy
- pep8==0.5.0
+ pep8>=0.5.0
  python-gflags
 -sqlalchemy
  simplejson
 +sqlalchemy
  webob
  webtest