Merge lp:~gandelman-a/ubuntu/quantal/keystone/2012.2.4 into lp:~openstack-ubuntu-testing/keystone/folsom

[Adam Gandelman]

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-23 00:43:03 +0000
+++ debian/changelog	2013-04-26 01:05:29 +0000
@@ -1,3 +1,28 @@
+keystone (2012.2.4-0ubuntu1) UNRELEASED; urgency=low
+
+  * Dropped patches, applied upstream:
+    - debian/patches/CVE-2013-1865.patch: [255b1d4]
+    - debian/patches/CVE-2013-0282.patch: [f0b4d30]
+    - debian/patches/CVE-2013-1664+1665.patch: [8a22745]
+  * Resynchronize with stable/folsom (09f28020):
+    - [5ea4fcf] V2 API reported at Beta LP: 1135230
+    - [1889299] PKI-signed token hash saved as token ID for SQL backend only
+      LP: 1073272
+    - [40660f0] Key PKI tokens on hash in memcached for auth_token middleware
+      LP: 1073343
+    - [b3ce6a7] Use the right subprocess based on os monkeypatch
+    - [bb1ded0] keystone-all --config-dir is being ignored LP: 1101129
+    - [9e0a97d] Temporary network outage results in connection refused and
+      invalid token LP: 1150299
+    - [255b1d4] Validation of PKI tokens bypasses revocation check LP: 1129713
+    - [8690166] PKI tokens are broken after 24 hours LP: 1074172
+    - [790c87e] PKI tokens are broken after 24 hours LP: 1074172
+    - [f0b4d30] EC2 authentication does not ensure user or tenant is enabled
+      LP: 1121494
+    - [8a22745] DoS through XML entity expansion (CVE-2013-1664) LP: 1100282
+
+ -- Adam Gandelman <[e-mail]>  Thu, 25 Apr 2013 17:51:09 -0400
+
 keystone (2012.2.3+stable-20130206-82c87e56-0ubuntu2) quantal-proposed; urgency=low
 
   * Resync with latest security updates.