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

Proposed by Corey Bryant
Status: Merged
Merged at revision: 278
Proposed branch: lp:~corey.bryant/keystone/2014.1.2
Merge into: lp:~ubuntu-server-dev/keystone/icehouse
Diff against target: 84 lines (+25/-17)
3 files modified
debian/changelog (+24/-0)
debian/patches/fix-requirements.patch (+0/-16)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/keystone/2014.1.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+230290@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/keystone/2014.1.2 updated
278. By James Page

* 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1keystone (1:2014.1.2.1-0ubuntu1) trusty; urgency=medium
2
3 * Resynchronize with stable/icehouse (935fd60) (LP: #1354159):
4 - [6cbf835] Fix revocation event handling with MySQL
5 - [c900a6e] Make test_revoke expiry times distinct
6 - [5c89c89] Fix revoking a scoped token from an unscoped token
7 - [dfb0ff0] Add a test for revoking a scoped token from an unscoped
8 - [317f9d3] Fix revoking domain-scoped tokens
9 - [cccc3f3] Correct revocation event test for domain_id
10 - [bdb88c6] Fix for V2 token issued_at time changing
11 - [0c34e79] Add tests related to V2 token issued_at time changing
12 - [8e87504] Don't override tox envdir for pep8
13 - [774b6ab] Correct the region table to be InnoDB and UTF8
14 - [6f8c444] HEAD responses should return same status as GET
15 - [44555e8] Ensure that in v2 auth tenant_id matches trust
16 - [2baae78] Do not log 14+ INFO lines on a broken pipe error (eventlet)
17 - [cef4fbc] Properly invalidate cache for get_*_by_name methods
18 - [e08b62a] Make sure domains are enabled by default
19 - [7378512] Block delegation escalation of privilege
20 - [935fd60] Encode/Decode LDAP parameters to/from UTF-8
21 * d/p/fix-requirements.patch: Refreshed.
22
23 -- Corey Bryant <corey.bryant@canonical.com> Fri, 08 Aug 2014 16:47:10 -0400
24
1keystone (1:2014.1.1-0ubuntu1) trusty; urgency=medium25keystone (1:2014.1.1-0ubuntu1) trusty; urgency=medium
226
3 * Resynchronize with stable/icehouse (1716748) (LP: #1328134):27 * Resynchronize with stable/icehouse (1716748) (LP: #1328134):
428
=== 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 @@
1Description: Set min version of six.
2Author: Corey Bryant <corey.bryant@canonical.com>
3Forwarded: Not needed.
4Index: keystone/requirements.txt
5===================================================================
6--- a/requirements.txt
7+++ b/requirements.txt
8@@ -7,7 +7,7 @@
9 PasteDeploy>=1.5.0
10 Paste
11 Routes>=1.12.3,!=2.0
12-six>=1.6.0
13+six>=1.5.2
14 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
15 sqlalchemy-migrate>=0.8.2,!=0.8.4
16 passlib
017
=== 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 @@
1Description: Set min version of six.
2Author: Corey Bryant <corey.bryant@canonical.com>
3Forwarded: Not needed.
4Index: keystone/requirements.txt
5===================================================================
6--- keystone.orig/requirements.txt 2014-06-13 10:14:20.196555030 -0400
7+++ keystone/requirements.txt 2014-06-13 11:48:22.840383005 -0400
8@@ -7,7 +7,7 @@
9 PasteDeploy>=1.5.0
10 Paste
11 Routes>=1.12.3
12-six>=1.6.0
13+six>=1.5.2
14 SQLAlchemy>=0.7.8,<=0.9.99
15 sqlalchemy-migrate>=0.8.2,!=0.8.4
16 passlib
170
=== 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 @@
1fix-requirements.patch
1fix-ubuntu-tests.patch2fix-ubuntu-tests.patch
2sql_connection.patch3sql_connection.patch
3add-version-info.patch4add-version-info.patch
4ubuntu-test-overrides.patch5ubuntu-test-overrides.patch
5fix-requirements.patch

Subscribers

People subscribed via source and target branches