Merge lp:~corey.bryant/keystone/2014.1.2 into lp:~ubuntu-server-dev/keystone/icehouse

[Corey Bryant]

[lp:~corey.bryant/keystone/2014.1.2]

278. By James Page on 2014-08-11

* Resynchronize with stable/icehouse (935fd60) (LP: #1354159):
  - [6cbf835] Fix revocation event handling with MySQL
  - [c900a6e] Make test_revoke expiry times distinct
  - [5c89c89] Fix revoking a scoped token from an unscoped token
  - [dfb0ff0] Add a test for revoking a scoped token from an unscoped
  - [317f9d3] Fix revoking domain-scoped tokens
  - [cccc3f3] Correct revocation event test for domain_id
  - [bdb88c6] Fix for V2 token issued_at time changing
  - [0c34e79] Add tests related to V2 token issued_at time changing
  - [8e87504] Don't override tox envdir for pep8
  - [774b6ab] Correct the region table to be InnoDB and UTF8
  - [6f8c444] HEAD responses should return same status as GET
  - [44555e8] Ensure that in v2 auth tenant_id matches trust
  - [2baae78] Do not log 14+ INFO lines on a broken pipe error (eventlet)
  - [cef4fbc] Properly invalidate cache for get_*_by_name methods
  - [e08b62a] Make sure domains are enabled by default
  - [7378512] Block delegation escalation of privilege
  - [935fd60] Encode/Decode LDAP parameters to/from UTF-8
* d/p/fix-requirements.patch: Refreshed.
* d/watch: Point to tarballs.openstack.org for release artifacts.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-16 11:08:59 +0000
+++ debian/changelog	2014-08-11 12:39:01 +0000
@@ -1,3 +1,27 @@
+keystone (1:2014.1.2.1-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (935fd60) (LP: #1354159):
+    - [6cbf835] Fix revocation event handling with MySQL
+    - [c900a6e] Make test_revoke expiry times distinct
+    - [5c89c89] Fix revoking a scoped token from an unscoped token
+    - [dfb0ff0] Add a test for revoking a scoped token from an unscoped
+    - [317f9d3] Fix revoking domain-scoped tokens
+    - [cccc3f3] Correct revocation event test for domain_id
+    - [bdb88c6] Fix for V2 token issued_at time changing
+    - [0c34e79] Add tests related to V2 token issued_at time changing
+    - [8e87504] Don't override tox envdir for pep8
+    - [774b6ab] Correct the region table to be InnoDB and UTF8
+    - [6f8c444] HEAD responses should return same status as GET
+    - [44555e8] Ensure that in v2 auth tenant_id matches trust
+    - [2baae78] Do not log 14+ INFO lines on a broken pipe error (eventlet)
+    - [cef4fbc] Properly invalidate cache for get_*_by_name methods
+    - [e08b62a] Make sure domains are enabled by default
+    - [7378512] Block delegation escalation of privilege
+    - [935fd60] Encode/Decode LDAP parameters to/from UTF-8
+  * d/p/fix-requirements.patch: Refreshed.
+
+ -- Corey Bryant <[e-mail]>  Fri, 08 Aug 2014 16:47:10 -0400
+
 keystone (1:2014.1.1-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (1716748) (LP: #1328134):

=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-08-11 12:39:01 +0000
@@ -0,0 +1,16 @@
+Description: Set min version of six.
+Author: Corey Bryant <[e-mail]>
+Forwarded: Not needed.
+Index: keystone/requirements.txt
+===================================================================
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -7,7 +7,7 @@
+ PasteDeploy>=1.5.0
+ Paste
+ Routes>=1.12.3,!=2.0
+-six>=1.6.0
++six>=1.5.2
+ SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+ passlib

=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-06-13 15:50:11 +0000
+++ debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Set min version of six.
-Author: Corey Bryant <[e-mail]>
-Forwarded: Not needed.
-Index: keystone/requirements.txt
-===================================================================
---- keystone.orig/requirements.txt	2014-06-13 10:14:20.196555030 -0400
-+++ keystone/requirements.txt	2014-06-13 11:48:22.840383005 -0400
-@@ -7,7 +7,7 @@
- PasteDeploy>=1.5.0
- Paste
- Routes>=1.12.3
--six>=1.6.0
-+six>=1.5.2
- SQLAlchemy>=0.7.8,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4
- passlib

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-06-13 15:50:11 +0000
+++ debian/patches/series	2014-08-11 12:39:01 +0000
@@ -1,5 +1,5 @@
+fix-requirements.patch
 fix-ubuntu-tests.patch
 sql_connection.patch
 add-version-info.patch
 ubuntu-test-overrides.patch
-fix-requirements.patch