Merge lp:~corey.bryant/keystone/2014.2.1 into lp:~ubuntu-server-dev/keystone/juno

[Corey Bryant]

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-16 19:30:06 +0000
+++ debian/changelog	2014-12-05 15:54:51 +0000
@@ -1,3 +1,13 @@
+keystone (1:2014.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (d7eb999) (LP: #1398952):
+    - [f54fa8f] Prevent infinite loop in token_flush
+    - [bd92689] Adds IPv6 url validation support
+    - [db291b3] Use newer python-ldap paging control API
+    - [d7eb999] Add oslo.serialization for latest keystoneclient
+
+ -- Corey Bryant <[e-mail]>  Fri, 05 Dec 2014 10:05:19 -0500
+
 keystone (1:2014.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.