Merge "Revert "Do not use warlock 1.3.0""

This commit is contained in:
Zuul 2018-01-17 12:39:16 +00:00 committed by Gerrit Code Review
commit 77fbc76097

View File

@ -323,7 +323,7 @@ tosca-parser>=0.8.1 # Apache-2.0
tripleo-common>=7.1.0 # Apache-2.0
urllib3>=1.21.1 # MIT
unicodecsv>=0.8.0;python_version<'3.0' # BSD
warlock>=1.2.0,!=1.3.0,<2 # Apache-2.0
warlock>=1.2.0,<2 # Apache-2.0
WebOb>=1.7.1 # MIT
# upper cap is due to kubernetes, see
# https://github.com/kubernetes-incubator/client-python/blob/v4.0.0/requirements.txt#L9