diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-01 08:49:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-01 08:49:26 +0000 |
| commit | ecc3d9f05bbeb087de86181f3b8f911c261de5c7 (patch) | |
| tree | 989fd848a1623967161979de44b480e5c32ffae9 | |
| parent | 1dbafa0025631c3d0f695fdbbd739285d26f662e (diff) | |
| parent | 6ad196a221aa50b3a3657fe17c02150e947e7ae0 (diff) | |
| download | heat-ecc3d9f05bbeb087de86181f3b8f911c261de5c7.tar.gz | |
Merge "Updated from global requirements" into stable/icehouse
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index 4b6298d53..1adc1365b 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 f8aab6837..1faa43fce 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 |