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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-11 13:18:04 +0000
+++ debian/changelog	2014-10-03 14:58:34 +0000
@@ -1,3 +1,15 @@
+ceilometer (2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (4e2c1cd) (LP: #1377136):
+    - [ccd6b98] VMware: Support secret host_password option
+    - [7ff220f] Fix tests with testtools>=0.9.39
+    - [014c41e] update default_log_levels set by ceilometer
+    - [0ba75c8] fix statistics query in postgres
+    - [4e2c1cd] fix StringIO errors in unit test
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 10:22:03 -0400
+
 ceilometer (2014.1.2-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-08-08 14:34:16 +0000
+++ debian/patches/fix-requirements.patch	2014-10-03 14:58:34 +0000
@@ -1,8 +1,6 @@
 Description: Disable pynsmp and set min version of pecan/six.
 Author: Corey Bryant <[e-mail]>
 Forwarded: Not needed.
-Index: ceilometer/requirements.txt
-===================================================================
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -16,8 +16,7 @@
@@ -22,5 +20,5 @@
 -six>=1.6.0
 +six>=1.5.2
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
  stevedore>=0.14