OpenStack Identity (keystone)

Merge lp:~corey.bryant/keystone/2014.1.4-0ubuntu2 into lp:~ubuntu-server-dev/keystone/icehouse

  1. 2014.1.4-0ubuntu2
  2. Merge into icehouse
Proposed by Corey Bryant
Status: Merged
Merged at revision: 282
Proposed branch: lp:~corey.bryant/keystone/2014.1.4-0ubuntu2
Merge into: lp:~ubuntu-server-dev/keystone/icehouse
Diff against target: 68 lines (+29/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/drop-oslo-serialization.patch (+19/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/keystone/2014.1.4-0ubuntu2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+254503@code.launchpad.net
To post a comment you must log in.

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 2015-03-19 09:32:05 +0000
3+++ debian/changelog 2015-03-29 19:16:21 +0000
4@@ -1,3 +1,10 @@
5+keystone (1:2014.1.4-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * d/p/drop-oslo-serialization.patch: Drop oslo.serialization (LP: #1437741).
8+ * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).
9+
10+ -- Corey Bryant <corey.bryant@canonical.com> Sat, 28 Mar 2015 22:11:38 -0400
11+
12 keystone (1:2014.1.4-0ubuntu1) trusty; urgency=medium
13
14 * Resynchronize with stable/icehouse (9aec35a) (LP: #1432608):
15
16=== modified file 'debian/control'
17--- debian/control 2014-10-10 13:09:17 +0000
18+++ debian/control 2015-03-29 19:16:21 +0000
19@@ -42,7 +42,7 @@
20 python-requests (>= 1.0.0),
21 python-routes,
22 python-setuptools,
23- python-six,
24+ python-six (>= 1.5.2),
25 python-sphinx,
26 python-sqlalchemy (>= 0.8.2),
27 python-testtools (>= 0.9.32),
28@@ -80,6 +80,7 @@
29 python-paste,
30 python-pastedeploy,
31 python-routes,
32+ python-six (>= 1.5.2),
33 python-sqlalchemy (>= 0.8.2),
34 python-webob (>= 1.0.8),
35 ${misc:Depends},
36
37=== added file 'debian/patches/drop-oslo-serialization.patch'
38--- debian/patches/drop-oslo-serialization.patch 1970-01-01 00:00:00 +0000
39+++ debian/patches/drop-oslo-serialization.patch 2015-03-29 19:16:21 +0000
40@@ -0,0 +1,19 @@
41+Description: Remove oslo.serialization from requirements.txt
42+ Change I00f66b0f3c8e9f688429ee78bd51608a4dcac140 added
43+ oslo.serialization to requirements.txt on stable to unwedge
44+ the gate due to keystone on stable testing against master
45+ level keystoneclient which required oslo.serialization.
46+Author: Matt Riedemann <mriedem@us.ibm.com>
47+Origin: https://review.openstack.org/#/c/165928/
48+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1437741
49+--- a/requirements.txt
50++++ b/requirements.txt
51+@@ -16,8 +16,6 @@
52+ python-keystoneclient>=0.7.0,<=0.11.2
53+ oslo.config>=1.2.0,<1.5
54+ oslo.messaging>=1.3.0,<1.5
55+-# only for Keystone tests running against keystoneclient master
56+-oslo.serialization>=0.1.0,<1.1 # Apache-2.0
57+ Babel>=1.3
58+ oauthlib>=0.6
59+ dogpile.cache>=0.5.0
60
61=== modified file 'debian/patches/series'
62--- debian/patches/series 2014-08-11 12:37:33 +0000
63+++ debian/patches/series 2015-03-29 19:16:21 +0000
64@@ -1,3 +1,4 @@
65+drop-oslo-serialization.patch
66 fix-requirements.patch
67 fix-ubuntu-tests.patch
68 sql_connection.patch

Subscribers

People subscribed via source and target branches