Merge lp:~james-page/ceilometer/requirements-fixup-pecan into lp:~ubuntu-server-dev/ceilometer/icehouse

[James Page]

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 09:32:37 +0000
+++ debian/changelog	2014-05-16 16:12:48 +0000
@@ -1,3 +1,10 @@
+ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium
+
+  * d/p/fix-requirements.patch: Drop required version of pecan to 0.3.0
+    inline with the version that is provided in 14.04 (LP: #1317147).
+
+ -- James Page <[e-mail]>  Fri, 16 May 2014 12:11:00 -0400
+
 ceilometer (2014.1-0ubuntu1) trusty; urgency=medium
 
   * New upstream release (LP: #1299055).
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-04-08 19:42:00 +0000
+++ debian/patches/fix-requirements.patch	2014-05-16 16:12:48 +0000
@@ -1,14 +1,15 @@
 Description: Disabled pynsmp.
 Author: Chuck Short <[e-mail]>
 Forwarded: Not needed.
-diff -Naurp ceilometer-2014.1.rc2.orig/requirements.txt ceilometer-2014.1.rc2/requirements.txt
---- ceilometer-2014.1.rc2.orig/requirements.txt	2014-04-08 15:15:38.000000000 -0400
-+++ ceilometer-2014.1.rc2/requirements.txt	2014-04-08 15:35:42.657859030 -0400
-@@ -17,7 +17,6 @@ oslo.config>=1.2.0
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -16,8 +16,7 @@ netaddr>=0.7.6
+ 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.7.0