Merge lp:~gandelman-a/ubuntu/saucy/ceilometer/2013.2.1 into lp:~ubuntu-server-dev/ceilometer/havana

[Adam Gandelman]

2013.2.1

2013.2.1

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 18:32:30 +0000
+++ debian/changelog	2013-12-19 20:33:53 +0000
@@ -1,5 +1,23 @@
-ceilometer (2013.2.1-0ubuntu2) UNRELEASED; urgency=low
+ceilometer (2013.2.1-0ubuntu2) saucy-proposed; urgency=low
 
+  * Resynchronize with stable/havana (fa5c8e2) (LP: #1262788):
+    - [ec31468] change alarm_history.detail column type to Text LP: 1236861
+    - [b616562] wsme 0.5b6 is broken LP: 1240741
+    - [d90c8e1] Open stable/havana
+    - [ef6c659] Ceilometer log contains DB password in plain text LP: 1244476
+    - [7ad530b] Pin test-requirement for Nova to Havana
+    - [d554fa8] import of rabbitMQ-specific config options regardless of
+      configured RPC backend LP: 1244698
+    - [99b21df] Havan rc2 acl scenarios failing due to timezone assumption
+      LP: 1240994
+    - [c5b7462] alarm creation with sqlalchemy fails with intermittent
+      IntegrityError LP: 1255107
+    - [ae82878] [Postgresql] ERROR in ceilometer-collector log after successful
+      tempest run LP: 1237671
+    - [5cbb965] [messaging] QPID broadcast RPC requests to all servers for a
+      given topic LP: 1257293
+    - [40b833c] On restart of QPID broker, fanout no longer works LP: 1251757
+    - [fa5c8e2] Updated from global requirements
   * debian/patches: Refreshed.
   * debian/patches/revert-keystone-compat.patch: Revert additional
     keystoneclient 0.4.0 compat changes that were applied to stable/havana