Merge lp:~zulcss/ubuntu/saucy/glance/2013.2.2 into lp:~ubuntu-server-dev/glance/havana

[Chuck Short]

2013.2.2

[James Page (james-page)]

Changelog need fixing - its not 2013.2.2 and some of the 2013.2.1 changes have been dropped from the log.

review: Needs Fixing

[lp:~zulcss/ubuntu/saucy/glance/2013.2.2]

271. By Chuck Short on 2014-02-25

Update

272. By Chuck Short on 2014-02-25

Fix changelog

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-19 20:26:48 +0000
+++ debian/changelog	2014-02-25 18:51:07 +0000
@@ -1,3 +1,17 @@
+glance (1:2013.2.2-0ubuntu1) saucy-proposed; urgency=low
+
+  * Resynchronize with stable/havana (9d89b8e) (LP: #1284643):
+    - [5cd7a22] Bump stable/havana next version to 2013.2.2
+    - [1a9e0e9] protected property change not rejected if a subsequent rule
+      match accepts them LP: 1271426
+    - [1982ca2] Openstack Glance: user_total_quota calculated incorrectly
+      LP: 1261738
+    - [edcbdf9] sensitive info in image location is logged when authentication
+      to single tenant swift store fails LP: 1275062
+    - [9d89b8e] Bump stable/havana next version to 2013.2.3
+
+ -- Chuck Short <[e-mail]>  Tue, 25 Feb 2014 09:07:05 -0500
+
 glance (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
 
   * Resynchronize with stable/havana (949cda0) (LP: #1262788):
@@ -13,13 +27,13 @@
     - [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
+    gate using a newer version of python-iso8601. Ubuntu's version
     is stable, the patch unncessary and causes failures.
   * debian/patches/revert-stable-havana-requirements.patch: Revert
     version bumps to dependencies in stable/havana back to what was
     shipped with Saucy.
 
- -- Adam Gandelman <[e-mail]>  Thu, 12 Dec 2013 12:52:40 -0800
+ -- Adam Gandelman <[e-mail]> Thu, 12 Dec 2013 12:52:40 -0800
 
 glance (1:2013.2-0ubuntu1) saucy; urgency=low
 
@@ -501,7 +515,6 @@
 
  -- Matthias Klose <[e-mail]>  Mon, 02 Jan 2012 13:02:24 +0100
 
-
 glance (2012.1~e2-0ubuntu2) precise; urgency=low
 
   * debian/glance-registry.postinst: Fix typo in postinst.
@@ -789,3 +802,4 @@
   * Initial upload.
 
  -- Soren Hansen <[e-mail]>  Wed, 19 Jan 2011 12:01:32 +0100
+