From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 29 Feb 2016 13:35:40 +0000 (+0000)
Subject: Merge "Move anyjson to test-requirements"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=14d7b1448b4b26a4812e251fa9769ba2ac878c16;p=openstack-build%2Fcinder-build.git

Merge "Move anyjson to test-requirements"
---

14d7b1448b4b26a4812e251fa9769ba2ac878c16
diff --cc requirements.txt
index a4733322d,7fe864ca3..7370aa2c3
--- a/requirements.txt
+++ b/requirements.txt
@@@ -3,11 -3,10 +3,10 @@@
  # process, which may cause wedges in the gate later.
  
  pbr>=1.6 # Apache-2.0
- anyjson>=0.3.3 # BSD
  Babel>=1.3 # BSD
 -decorator>=3.4.0  # BSD
 +decorator>=3.4.0 # BSD
  enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
 -eventlet>=0.18.2 # MIT
 +eventlet!=0.18.3,>=0.18.2 # MIT
  greenlet>=0.3.2 # MIT
  iso8601>=0.1.9 # MIT
  keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0