From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 15 Jul 2014 22:11:03 +0000 (+0000)
Subject: Merge "Use auth_token from keystonemiddleware"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=895cf8ee86c4de8668f4f7a343435abe2a3fea4c;p=openstack-build%2Fneutron-build.git

Merge "Use auth_token from keystonemiddleware"
---

895cf8ee86c4de8668f4f7a343435abe2a3fea4c
diff --cc requirements.txt
index ba62c1c10,30792407e..e7484e5d9
--- a/requirements.txt
+++ b/requirements.txt
@@@ -13,13 -13,14 +13,14 @@@ requests>=1.
  iso8601>=0.1.9
  jsonrpclib
  Jinja2
+ keystonemiddleware
  kombu>=2.4.8
  netaddr>=0.7.6
 -python-neutronclient>=2.3.4,<3
 -SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
 +python-neutronclient>=2.3.5,<3
 +SQLAlchemy>=0.8.4,!=0.9.5,<=0.9.99
  WebOb>=1.2.3
  python-keystoneclient>=0.9.0
 -alembic>=0.4.1
 +alembic>=0.6.2
  six>=1.7.0
  stevedore>=0.14
  oslo.config>=1.2.1