Merge lp:~corey.bryant/keystone/2013.2.3 into lp:~ubuntu-server-dev/keystone/havana

[Corey Bryant]

Resynchronize with stable/havana

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-25 22:56:11 +0000
+++ debian/changelog	2014-04-04 15:24:20 +0000
@@ -1,3 +1,14 @@
+keystone (1:2013.2.3-0ubuntu1) saucy-proposed; urgency=medium
+
+  * Resynchronize with stable/havana (b85a531) (LP: #1302575):
+    - [a96d1a4] User a more accurate max_delay for reconnects
+    - [a120f25] Fix issue deleting ec2-credentials as non-admin user
+    - [181c3c1] SQLAlchemy Change to support more strict dialect checking
+    - [b6f0e26] Ensure tokens are added to both Trustor and Trustee indexes
+    - [b85a531] Fix list_projects_for_endpoint failed bug
+
+ -- Corey Bryant <[e-mail]>  Fri, 04 Apr 2014 10:58:26 -0400
+
 keystone (1:2013.2.2-0ubuntu1) saucy-proposed; urgency=low
 
   [ Chuck Short ]