diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-13 19:14:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-13 19:14:13 +0000 |
| commit | 513a84769e7677bb90deb245651bfc0d7bc95ec5 (patch) | |
| tree | 2f659e726d15f960749abf3d9acb87621f8adede | |
| parent | b30ad670db53c6b12ed6634e108b86cdab64158a (diff) | |
| parent | 427e2237aaad53c3ea5edb3ae56b0cc58ff66127 (diff) | |
| download | ironic-513a84769e7677bb90deb245651bfc0d7bc95ec5.tar.gz | |
Merge "Updated from global requirements" into stable/icehouse
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index 85f447362..53033907e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ pbr>=0.6,<1.0 -SQLAlchemy>=0.7.8,<=0.9.99 +SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99 alembic>=0.4.1 amqplib>=0.6.1 anyjson>=0.3.3 @@ -10,8 +10,8 @@ lockfile>=0.8 lxml>=2.3 WebOb>=1.2.3 greenlet>=0.3.2 -futures>=2.1.3 -sqlalchemy-migrate>=0.8.2,!=0.8.4 +futures>=2.1.6 +sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2 netaddr>=0.7.6 paramiko>=1.9.0 iso8601>=0.1.9 diff --git a/test-requirements.txt b/test-requirements.txt index 9dd7463b0..5cd9a6950 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,6 +11,6 @@ testrepository>=0.0.18 testtools>=0.9.34 # Doc requirements -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,<1.1.999 sphinxcontrib-pecanwsme>=0.6 oslosphinx |