Merge lp:~corey.bryant/ceilometer/2014.1.5 into lp:~ubuntu-server-dev/ceilometer/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-30 12:40:22 +0000
+++ debian/changelog	2015-06-22 15:28:30 +0000
@@ -1,3 +1,12 @@
+ceilometer (2014.1.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (04b66db) (LP: #1467533):
+    - [737e899] Fixes ceilometer-compute service start failure
+    - [04b66db] fix the value of query_spec.maxSample to advoid to be zero
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:11:03 -0400
+
 ceilometer (2014.1.4-0ubuntu2) trusty; urgency=medium
 
   * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-03-16 20:09:14 +0000
+++ debian/patches/fix-requirements.patch	2015-06-22 15:28:30 +0000
@@ -4,21 +4,21 @@
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -18,8 +18,7 @@
- netaddr>=0.7.6
+ netaddr>=0.7.6,<=0.7.14
  oslo.config>=1.2.0,<1.5
  pbr>=0.6,<1.0
--pecan>=0.4.5
+-pecan>=0.4.5,<=0.8.3
 -pysnmp>=4.2.1,<5.0.0
-+pecan>=0.3.0
++pecan>=0.3.0,<=0.8.3
  python-ceilometerclient>=1.0.6,<=1.0.12
  python-glanceclient>=0.9.0,!=0.14.0,<=0.14.2
- python-keystoneclient>=0.7.0,<=0.11.2
+ python-keystoneclient>=0.7.0,<0.12.0
 @@ -28,7 +27,7 @@
- pytz>=2010h
- PyYAML>=3.1.0
- requests>=1.1
--six>=1.6.0
-+six>=1.5.2
+ pytz>=2010h,<=2015.2
+ PyYAML>=3.1.0,<=3.11
+ requests>=1.1,<=2.6.0
+-six>=1.6.0,<=1.9.0
++six>=1.5.2,<=1.9.0
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
  sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
- stevedore>=0.14,<1.2
+ stevedore>=0.14