diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-17 15:36:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-17 15:36:25 +0000 |
| commit | a922e10e47ccd0a481501374d88b196ce468bd33 (patch) | |
| tree | bc20fdc9af48b805802afa806bcdd330f2568bc9 | |
| parent | 66365a525ab1aa2a40f230afbd14f7c5a89a8e42 (diff) | |
| parent | 0ed7068de9f6949cec5dcff5b409aced2a171d0e (diff) | |
| download | ceilometer-a922e10e47ccd0a481501374d88b196ce468bd33.tar.gz | |
Merge "Updated from global requirements" into stable/kilo
| -rw-r--r-- | test-requirements-py3.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt index fe007b87..1eec7a0d 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -22,4 +22,4 @@ sphinxcontrib-httpdomain sphinxcontrib-pecanwsme>=0.8 testrepository>=0.0.18 testscenarios>=0.4 -testtools!=1.2.0,>=0.9.36 +testtools!=1.2.0,<2.0.0,>=0.9.36 diff --git a/test-requirements.txt b/test-requirements.txt index 9b73c1ee..e010f788 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -26,7 +26,7 @@ sphinxcontrib-httpdomain sphinxcontrib-pecanwsme>=0.8 testrepository>=0.0.18 testscenarios>=0.4 -testtools!=1.2.0,>=0.9.36 +testtools!=1.2.0,<2.0.0,>=0.9.36 gabbi>=0.12.0 # Apache-2.0 requests-aws>=0.1.4 # BSD License (3 clause) WebTest>=2.0 |