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

[Adam Gandelman]

2013.2.1

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 18:33:29 +0000
+++ debian/changelog	2013-12-19 20:32:50 +0000
@@ -1,5 +1,16 @@
-glance (1:2013.2.1-0ubuntu1) UNRELEASED; urgency=low
+glance (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
 
+  * Resynchronize with stable/havana (949cda0) (LP: #1262788):
+    - [252fe85] Open stable/havana
+    - [e20b2af] Qpid protocol configuration is wrong LP: 1243821
+    - [0f66c54] Error message encoding issue when using qpid LP: 1242734
+    - [5b8f18b] Wrong parameter in the config file s/qpid_host/qpid_hostname/
+      LP: 1242715
+    - [9b52a89] Jenkins failed due to
+      TestGlanceAPI.test_get_details_filter_changes_since LP: 1242501
+    - [949cda0] Updated from global requirements
+    - [5cd7a22] Bump stable/havana next version to 2013.2.2
+    - [949cda0] Updated from global requirements
   * d/p/debian/patches/revert_upstream_iso8601_fixes.patch: Reverts
     patch that was committed to allow tests to pass in upstreams
     gate using a newer version of python-iso8601.  Ubuntu's version