diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-29 07:20:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-29 07:20:31 +0000 |
| commit | 6aa5cd7d98bf58853548cf18bf58654f34ad082e (patch) | |
| tree | 77c9f786e822ec1f5b48fea98d3b05da2e49c7c7 | |
| parent | fb353b73ad8ee3b91b20b10b949c954b73bfe05d (diff) | |
| parent | 31af52fb77c7f74c0d651d09859be1f46ad5cd97 (diff) | |
| download | kolla-6aa5cd7d98bf58853548cf18bf58654f34ad082e.tar.gz kolla-6aa5cd7d98bf58853548cf18bf58654f34ad082e.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 bd0a71f3a..142f6f691 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. pbr>=1.8 # Apache-2.0 -docker-py<1.8.0,>=1.6.0 # Apache-2.0 +docker-py!=1.8.0,>=1.6.0 # Apache-2.0 Jinja2>=2.8 # BSD License (3 clause) gitdb>=0.6.4 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) diff --git a/test-requirements.txt b/test-requirements.txt index 839291cd0..c4d80aeb4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,7 +16,7 @@ PrettyTable<0.8,>=0.7.1 # BSD PyYAML>=3.10.0 # MIT python-barbicanclient>=4.0.0 # Apache-2.0 python-ceilometerclient>=2.5.0 # Apache-2.0 -python-heatclient>=1.5.0 # Apache-2.0 +python-heatclient>=1.6.1 # Apache-2.0 python-neutronclient>=5.1.0 # Apache-2.0 python-openstackclient>=3.3.0 # Apache-2.0 python-swiftclient>=2.2.0 # Apache-2.0 |