Merge lp:~corey.bryant/ubuntu/utopic/python-keystonemiddleware/1.0.0-1ubuntu1 into lp:ubuntu/utopic-proposed/python-keystonemiddleware

[Corey Bryant]

[Martin Pitt (pitti)]

Apparently this was already uploaded, closing.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-08 14:25:47 +0000
+++ debian/changelog	2015-06-15 19:42:24 +0000
@@ -1,3 +1,11 @@
+python-keystonemiddleware (1.0.0-1ubuntu1) UNRELEASED; urgency=medium
+
+  * d/p/refresh-expired-admin-token.patch: Fix bug to enable refresh of
+    expired admin token.  Thanks to Sergio Martins for recommending
+    this fix. (LP: #1460833).
+
+ -- Corey Bryant <[e-mail]>  Mon, 15 Jun 2015 15:13:31 -0400
+
 python-keystonemiddleware (1.0.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #755135)

=== added file 'debian/patches/refresh-expired-admin-token.patch'
--- debian/patches/refresh-expired-admin-token.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/refresh-expired-admin-token.patch	2015-06-15 19:42:24 +0000
@@ -0,0 +1,18 @@
+Description: Fix bug to enable refresh of expired admin token.
+             https://bugs.launchpad.net/ubuntu/+source/python-keystonemiddleware/+bug/1460833
+             Thanks to Sergio Martins for recommending this fix.
+Author: Corey Bryant <[e-mail]>
+Forwarded: No
+Last-Update: 2015-06-15
+
+--- a/keystonemiddleware/auth_token.py
++++ b/keystonemiddleware/auth_token.py
+@@ -1119,7 +1119,7 @@
+             raise InvalidUserToken('Token authorization failed')
+         if response.status_code == 401:
+             self._LOG.info('Keystone rejected admin token, resetting')
+-            self.admin_token = None
++            self._admin_token = None
+         else:
+             self._LOG.error('Bad response code while validating token: %s',
+                             response.status_code)

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-08 14:25:47 +0000
+++ debian/patches/series	2015-06-15 19:42:24 +0000
@@ -1,1 +1,2 @@
 removes-discover-from-test-requirements.txt
+refresh-expired-admin-token.patch