X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fpatches%2Ffix-requirements.patch;h=e23b8cbb80048d75969b7c489a236d93b741b389;hb=afed5ec8f0d0c0a7a15923f7764baef4a5d5b6ba;hp=d14d9767d05dbe020fec44c5c0a3dcd98fe7924c;hpb=fbe97740634e9b1a36701dbf3a1ffc0374a91fab;p=openstack-build%2Fceilometer-build.git

diff --git a/debian/patches/fix-requirements.patch b/debian/patches/fix-requirements.patch
index d14d976..e23b8cb 100644
--- a/debian/patches/fix-requirements.patch
+++ b/debian/patches/fix-requirements.patch
@@ -1,14 +1,26 @@
-Description: Disabled pynsmp.
-Author: Chuck Short <zulcss@ubuntu.com>
+Description: Disable pynsmp and set min version of pecan/six.
+Author: Corey Bryant <corey.bryant@canonical.com>
 Forwarded: Not needed.
-diff -Naurp ceilometer-2014.1.b3.orig/requirements.txt ceilometer-2014.1.b3/requirements.txt
---- ceilometer-2014.1.b3.orig/requirements.txt	2014-03-06 11:33:29.000000000 -0500
-+++ ceilometer-2014.1.b3/requirements.txt	2014-03-20 12:49:30.262158266 -0400
-@@ -16,7 +16,6 @@ oslo.config>=1.2.0
- oslo.vmware
+Index: ceilometer/requirements.txt
+===================================================================
+--- ceilometer.orig/requirements.txt	2014-06-13 10:13:20.380556854 -0400
++++ ceilometer/requirements.txt	2014-06-13 10:42:20.980503789 -0400
+@@ -16,8 +16,7 @@
+ oslo.config>=1.2.0
+ oslo.vmware>=0.2                        # Apache-2.0
  pbr>=0.6,<1.0
- pecan>=0.4.5
+-pecan>=0.4.5
 -pysnmp>=4.2.1,<5.0.0
++pecan>=0.3.0
  python-ceilometerclient>=1.0.6
  python-glanceclient>=0.9.0
- python-keystoneclient>=0.6.0
+ python-keystoneclient>=0.7.0
+@@ -26,7 +25,7 @@
+ pytz>=2010h
+ PyYAML>=3.1.0
+ requests>=1.1
+-six>=1.6.0
++six>=1.5.2
+ SQLAlchemy>=0.7.8,<=0.9.99
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+ stevedore>=0.14