diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-30 13:25:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-30 13:25:20 +0000 |
| commit | 5de88a1d58496ec7c933229d0f9dcd8e308c2693 (patch) | |
| tree | 0a32023842629f88a73c4dc1b13d5896a47df4c4 | |
| parent | ecf6fa134202dda4e6f2f2b22e381533984afa84 (diff) | |
| parent | 3ce27ce7bbdb554d529e9692815c93d9a0151f8d (diff) | |
| download | ceilometer-5.0.4.tar.gz | |
Merge "Updated from global requirements" into stable/liberty5.0.4
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index 18f64496..09dc9ee0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0 pysnmp<5.0.0,>=4.2.1 python-ceilometerclient>=1.5.0 python-glanceclient>=0.18.0 -python-keystoneclient!=1.8.0,>=1.6.0 +python-keystoneclient!=1.8.0,<3.0.0,>=1.6.0 python-neutronclient>=2.6.0 python-novaclient!=2.33.0,>=2.28.1 python-swiftclient>=2.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index a34286fc..b2e84ada 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,7 @@ # Hacking already pins down pep8, pyflakes and flake8 hacking<0.11,>=0.10.0 -Babel>=1.3 +Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD contextlib2>=0.4.0 # PSF License coverage>=3.6 elasticsearch>=1.3.0 |