From 6ad196a221aa50b3a3657fe17c02150e947e7ae0 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Thu, 24 Jul 2014 16:46:50 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: Ib84db5aaf53e8f44efde0ae400ac6fa4187f27df
---
 requirements.txt      | 4 ++--
 test-requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4b6298d53c..1adc1365b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,8 +13,8 @@ sqlalchemy-migrate>=0.8.2,!=0.8.4
 python-novaclient>=2.17.0
 PasteDeploy>=1.5.0
 requests>=1.1
-Routes>=1.12.3
-SQLAlchemy>=0.7.8,<=0.9.99
+Routes>=1.12.3,!=2.0
+SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
 WebOb>=1.2.3
 python-heatclient>=0.2.3
 python-keystoneclient>=0.7.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f8aab68375..1faa43fce1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,6 +9,6 @@ testtools>=0.9.34
 testrepository>=0.0.18
 testscenarios>=0.4
 python-glanceclient>=0.9.0
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,<1.1.999
 oslosphinx
 lockfile>=0.8