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

[Chuck Short]

2013.2.2

[James Page (james-page)]

Changelog need fixing - some prior changelog data has been changed/dropped.

review: Needs Fixing

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-13 13:49:17 +0000
+++ debian/changelog	2014-02-25 15:23:58 +0000
@@ -1,8 +1,21 @@
-keystone (1:2013.2.1+stable-0ubuntu1) UNRELEASED; urgency=medium
-
-  * d/control: Add new BD on python-fixtures.
-
- -- James Page <[e-mail]>  Thu, 13 Feb 2014 13:41:21 +0000
+keystone (1:2013.2.2-0ubuntu1) saucy-proposed; urgency=low
+
+  * Resynchronize with stable/havana (c22f2ed) (LP: #1284643):
+    - [cecee8e] Keystone doesn't handle UTF8 in exceptions LP: 1253905
+    - [2e9782b] Keystone doesn't handle UTF8 in exceptions LP: 1253905
+    - [1091445] Have tox use pip upgrade when installing
+    - [2724951] Orphan exchanges in Qpid and lack of option for making queues
+      [un]durable LP: 1178375
+    - [a5c7d23] List Trusts generates HTTP Error 500  LP: 1245590
+    - [bd23600] publish_errors cfg option is broken  LP: 1240349
+    - [987e18e] Adds fixture package from oslo
+    - [73968f7] Some Python requirements are not hosted on PyPI LP: 1266513
+    - [9056b66] keystone.token.backends.sql list_revoked_tokens performs very
+      poorly LP: 1253755
+    - [c22f2ed] _update_user_list_with_cas causes significant overhead (when
+      using memcached as token store backend) LP: 1251123
+
+ -- Chuck Short <[e-mail]>  Tue, 25 Feb 2014 09:41:56 -0500
 
 keystone (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
 
@@ -14,38 +27,8 @@
     - [64ac189] Updated from global requirements
     - [03ed8c3] [OSSA 2013-032] Keystone trust circumvention through EC2-style
       tokens (CVE-2013-6391) LP: 1242597
-  * Dropped patches, applied upstream:
-    - debian/patches/CVE-2013-4477.patch: [4221b60]
-    - debian/patches/CVE-2013-6391.patch: [03ed8c3]
-  * debian/patches/fix-ubuntu-tests.patch: Update to skip a test introduced
-    with [03ed8c3] that requires a more recent version of
-    python-keystoneclient.
-  * 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]>  Tue, 17 Dec 2013 20:08:25 -0800
-
-keystone (1:2013.2-0ubuntu1.2) saucy-security; urgency=low
-
-  * SECURITY UPDATE: Keystone trust circumvention through EC2-style tokens
-    - debian/patches/CVE-2013-6391.patch: addjust to store the trust_id with
-      the ec2 keypair and pass this with metadata when requesting v2 token
-    - CVE-2013-6391
-    - LP: #1242597
-
- -- Jamie Strandboge <[e-mail]>  Thu, 19 Dec 2013 13:45:15 -0600
-
-keystone (1:2013.2-0ubuntu1.1) saucy-security; urgency=low
-
-  * SECURITY UPDATE: don't add role when attempting to remove a non-existent
-    role
-    - debian/patches/CVE-2013-4477.patch: raise RoleNotFound with exception
-      ldap.NO_SUCH_OBJECT
-    - CVE-2013-4477
-    - LP: #1242855
-
- -- Jamie Strandboge <[e-mail]>  Tue, 05 Nov 2013 09:06:12 -0600
+
+ -- Adam Gandelman <[e-mail]>  Thu, 19 Dec 2013 11:57:25 -0800
 
 keystone (1:2013.2-0ubuntu1) saucy; urgency=low
 
@@ -550,7 +533,6 @@
 
  -- Chuck Short <[e-mail]>  Fri, 16 Dec 2011 15:38:05 -0500
 
-
 keystone (2012.1~e2~20111209.1405-0ubuntu1) precise; urgency=low
 
   * New upstream release.