From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 29 Apr 2012 22:49:38 +0000 (+0000)
Subject: Merge "Removed simplejson from pip-requires."
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f6c71b52e90a496b9bf2bfd7fb93339906ecc6d6;p=openstack-build%2Fneutron-build.git

Merge "Removed simplejson from pip-requires."
---

f6c71b52e90a496b9bf2bfd7fb93339906ecc6d6
diff --cc tools/pip-requires
index 8e36f6ddc,1c5dd413c..43be661c2
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@@ -5,6 -5,7 +5,5 @@@ eventlet>=0.9.1
  lxml
  mox==0.5.3
  python-gflags==1.3
- simplejson
  sqlalchemy
  webob==1.0.8
 -
 --e git+https://review.openstack.org/p/openstack/python-quantumclient#egg=python-quantumclient