Merge lp:~corey.bryant/ceilometer/2014.2.1 into lp:~ubuntu-server-dev/ceilometer/juno

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-16 18:30:21 +0000
+++ debian/changelog	2014-12-05 13:57:13 +0000
@@ -1,3 +1,22 @@
+ceilometer (2014.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (b1fca33) (LP: #1398952):
+    - [43718e8] Internal error with period overflow
+    - [37e593e] Validate AdvEnum & return an InvalidInput on error
+    - [3489129] Fix signature validation failure when using qpid message queue
+    - [5879dbe] Change event type for identity trust notifications
+    - [638c66c] Add timeout to all http requests
+    - [d3bcd14] Database.max_retries only override on sqlalchemy side
+    - [ca52652] Add encoding to keys in compute_signature
+    - [48a2957] Add user_metadata to network samples
+    - [b545b27] fix swift middleware parsing
+    - [1324ab7] Fixes Hyper-V Inspector disk metrics cache issue
+    - [470ba0a] Sync strutils from oslo-incubator for mask_password fix
+    - [b1fca33] Handle poorly formed individual sensor readings
+  * d/p/fix-requirements.txt: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 05 Dec 2014 08:31:02 -0500
+
 ceilometer (2014.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release. 

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-05 13:26:42 +0000
+++ debian/patches/fix-requirements.patch	2014-12-05 13:57:13 +0000
@@ -38,4 +38,4 @@
 -sphinxcontrib-pecanwsme>=0.8
  testrepository>=0.0.18
  testscenarios>=0.4
- testtools>=0.9.34
+ testtools>=0.9.34,!=1.4.0