Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2017-05-25 08:58:05 +00:00 committed by Gerrit Code Review
commit 38b1a020f0
2 changed files with 3 additions and 3 deletions

@ -10,7 +10,7 @@ python-ironic-inspector-client>=1.5.0 # Apache-2.0
python-heatclient>=1.6.1 # Apache-2.0 python-heatclient>=1.6.1 # Apache-2.0
python-ironicclient>=1.11.0 # Apache-2.0 python-ironicclient>=1.11.0 # Apache-2.0
python-mistralclient>=3.1.0 # Apache-2.0 python-mistralclient>=3.1.0 # Apache-2.0
python-openstackclient>=3.3.0 # Apache-2.0 python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
six>=1.9.0 # MIT six>=1.9.0 # MIT
osc-lib>=1.5.1 # Apache-2.0 osc-lib>=1.5.1 # Apache-2.0
websocket-client>=0.32.0 # LGPLv2+ websocket-client>=0.32.0 # LGPLv2+

@ -3,12 +3,12 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
coverage>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
docutils>=0.11 # OSI-Approved Open Source, Public Domain docutils>=0.11 # OSI-Approved Open Source, Public Domain
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0 # BSD mock>=2.0 # BSD
oslosphinx>=4.7.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0
sphinx>=1.5.1 # BSD sphinx!=1.6.1,>=1.5.1 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
requests-mock>=1.1 # Apache-2.0 requests-mock>=1.1 # Apache-2.0