diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-15 20:56:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-15 20:56:44 +0000 |
| commit | 6643beb1421dbd631729525af72dd7fca5258486 (patch) | |
| tree | 788ec2eec5428ca6cf721dc07cc31aee0d43aa05 | |
| parent | 1d9b41f3d8ef05ea1b9516a6e853eb7f84c67e18 (diff) | |
| parent | 4362d23da107f6d3245e1f4d61e893c9f4cc601c (diff) | |
| download | kolla-6643beb1421dbd631729525af72dd7fca5258486.tar.gz kolla-6643beb1421dbd631729525af72dd7fca5258486.zip | |
Merge "Updated from global requirements"
| -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 fe9d72cbc..7ad8d5d52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) gitdb>=0.6.4 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) six>=1.9.0 # MIT -oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 +oslo.config>=3.22.0 # Apache-2.0 oslo.utils>=3.20.0 # Apache-2.0 setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,>=16.0 # PSF/ZPL pycrypto>=2.6 # Public Domain diff --git a/test-requirements.txt b/test-requirements.txt index f58dc250a..d0c74bea3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ ddt>=1.0.1 # MIT doc8 # Apache-2.0 extras # MIT graphviz!=0.5.0,>=0.4.0 # MIT License -hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 +hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 oslo.log>=3.11.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0 |