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

Proposed by Corey Bryant on 2014-08-11
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 2014-08-11 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 on 2014-08-11
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-06-16 11:08:59 +0000
3+++ debian/changelog 2014-08-11 12:39:01 +0000
4@@ -1,3 +1,27 @@
5+keystone (1:2014.1.2.1-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (935fd60) (LP: #1354159):
8+ - [6cbf835] Fix revocation event handling with MySQL
9+ - [c900a6e] Make test_revoke expiry times distinct
10+ - [5c89c89] Fix revoking a scoped token from an unscoped token
11+ - [dfb0ff0] Add a test for revoking a scoped token from an unscoped
12+ - [317f9d3] Fix revoking domain-scoped tokens
13+ - [cccc3f3] Correct revocation event test for domain_id
14+ - [bdb88c6] Fix for V2 token issued_at time changing
15+ - [0c34e79] Add tests related to V2 token issued_at time changing
16+ - [8e87504] Don't override tox envdir for pep8
17+ - [774b6ab] Correct the region table to be InnoDB and UTF8
18+ - [6f8c444] HEAD responses should return same status as GET
19+ - [44555e8] Ensure that in v2 auth tenant_id matches trust
20+ - [2baae78] Do not log 14+ INFO lines on a broken pipe error (eventlet)
21+ - [cef4fbc] Properly invalidate cache for get_*_by_name methods
22+ - [e08b62a] Make sure domains are enabled by default
23+ - [7378512] Block delegation escalation of privilege
24+ - [935fd60] Encode/Decode LDAP parameters to/from UTF-8
25+ * d/p/fix-requirements.patch: Refreshed.
26+
27+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 08 Aug 2014 16:47:10 -0400
28+
29 keystone (1:2014.1.1-0ubuntu1) trusty; urgency=medium
30
31 * Resynchronize with stable/icehouse (1716748) (LP: #1328134):
32
33=== added file 'debian/patches/fix-requirements.patch'
34--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
35+++ debian/patches/fix-requirements.patch 2014-08-11 12:39:01 +0000
36@@ -0,0 +1,16 @@
37+Description: Set min version of six.
38+Author: Corey Bryant <corey.bryant@canonical.com>
39+Forwarded: Not needed.
40+Index: keystone/requirements.txt
41+===================================================================
42+--- a/requirements.txt
43++++ b/requirements.txt
44+@@ -7,7 +7,7 @@
45+ PasteDeploy>=1.5.0
46+ Paste
47+ Routes>=1.12.3,!=2.0
48+-six>=1.6.0
49++six>=1.5.2
50+ SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
51+ sqlalchemy-migrate>=0.8.2,!=0.8.4
52+ passlib
53
54=== removed file 'debian/patches/fix-requirements.patch'
55--- debian/patches/fix-requirements.patch 2014-06-13 15:50:11 +0000
56+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
57@@ -1,16 +0,0 @@
58-Description: Set min version of six.
59-Author: Corey Bryant <corey.bryant@canonical.com>
60-Forwarded: Not needed.
61-Index: keystone/requirements.txt
62-===================================================================
63---- keystone.orig/requirements.txt 2014-06-13 10:14:20.196555030 -0400
64-+++ keystone/requirements.txt 2014-06-13 11:48:22.840383005 -0400
65-@@ -7,7 +7,7 @@
66- PasteDeploy>=1.5.0
67- Paste
68- Routes>=1.12.3
69--six>=1.6.0
70-+six>=1.5.2
71- SQLAlchemy>=0.7.8,<=0.9.99
72- sqlalchemy-migrate>=0.8.2,!=0.8.4
73- passlib
74
75=== modified file 'debian/patches/series'
76--- debian/patches/series 2014-06-13 15:50:11 +0000
77+++ debian/patches/series 2014-08-11 12:39:01 +0000
78@@ -1,5 +1,5 @@
79+fix-requirements.patch
80 fix-ubuntu-tests.patch
81 sql_connection.patch
82 add-version-info.patch
83 ubuntu-test-overrides.patch
84-fix-requirements.patch

Subscribers

People subscribed via source and target branches