From 025373f38f2f273e4d3289e75663d934c4bd4e6a Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Mon, 15 Jan 2018 12:39:25 +0100
Subject: [PATCH] Revert "Do not use warlock 1.3.0"

The fixes have propagated meanwhile, so we
should be good with allowing newer warlock.

This reverts commit 0e7a14a4f11ab22734724c60c824598be2fd7451.

Related-Bug: #1596573
Change-Id: I5551343914f43c7609e94ba307b4daae1d2004c2
---
 global-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global-requirements.txt b/global-requirements.txt
index 2de81aec6a..5cfdbcb1e6 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -321,7 +321,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