Merge lp:~corey.bryant/keystone/2015.1.1 into lp:~ubuntu-server-dev/keystone/kilo

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-03 17:51:31 +0000
+++ debian/changelog	2015-08-03 19:29:57 +0000
@@ -1,3 +1,17 @@
+keystone (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (54400bf) (LP: #1481008):
+    - [c4dc133] Mask passwords in debug log on user password operations
+    - [fba2d5c] Add test showing password logged
+    - [afaaf11] Fix xmldsig import
+    - [ec30329] Pass-in domain when testing saml signing
+    - [0c0bf69] Add openstack_project_domain to assertion
+    - [dafe5f9] Fix signed_saml2_assertion.xml tests fixture
+    - [67cda0c] Eventlet green threads not released back to pool
+    - [54400bf] Remove project association before removing endpoint group
+
+ -- Corey Bryant <[e-mail]>  Mon, 03 Aug 2015 14:30:05 -0400
+
 keystone (1:2015.1.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release for OpenStack kilo. (LP: #1449744)