OpenStack Identity (keystone)

Merge lp:~zulcss/keystone/keystone-refreshed into lp:~ubuntu-server-dev/keystone/havana

  1. keystone-refreshed
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 203
Proposed branch: lp:~zulcss/keystone/keystone-refreshed
Merge into: lp:~ubuntu-server-dev/keystone/havana
Diff against target: 41 lines (+6/-6)
2 files modified
debian/changelog (+1/-1)
debian/patches/sql_connection.patch (+5/-5)
To merge this branch: bzr merge lp:~zulcss/keystone/keystone-refreshed
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+170639@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm! Might be worth adding a changelog entry

review: Approve

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 2013-06-11 20:11:18 +0000
3+++ debian/changelog 2013-06-20 14:41:50 +0000
4@@ -1,4 +1,4 @@
5-keystone (1:2013.2.b1.46.gb3e4969-0ubuntu1) UNRELEASED; urgency=low
6+keystone (1:2013.2.b1.111.g7ccfac7-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Adam Gandelman ]
9 * debian/patches/*: Refresh
10
11=== modified file 'debian/patches/sql_connection.patch'
12--- debian/patches/sql_connection.patch 2013-06-06 18:10:33 +0000
13+++ debian/patches/sql_connection.patch 2013-06-20 14:41:50 +0000
14@@ -1,6 +1,6 @@
15-diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/etc/keystone.conf.sample keystone-2013.2.b1.46.gb3e4969/etc/keystone.conf.sample
16---- keystone-2013.2.b1.46.gb3e4969.orig/etc/keystone.conf.sample 2013-06-06 13:02:21.000000000 -0500
17-+++ keystone-2013.2.b1.46.gb3e4969/etc/keystone.conf.sample 2013-06-06 13:09:45.325872902 -0500
18+diff -Naurp keystone-2013.2.b1.111.g7ccfac7.orig/etc/keystone.conf.sample keystone-2013.2.b1.111.g7ccfac7/etc/keystone.conf.sample
19+--- keystone-2013.2.b1.111.g7ccfac7.orig/etc/keystone.conf.sample 2013-06-20 09:05:17.000000000 -0500
20++++ keystone-2013.2.b1.111.g7ccfac7/etc/keystone.conf.sample 2013-06-20 09:22:24.191764787 -0500
21 @@ -52,10 +52,10 @@
22 # verbose = False
23
24@@ -51,7 +51,7 @@
25 # template_file = default_catalog.templates
26
27 [token]
28--# driver = keystone.token.backends.kvs.Token
29+-# driver = keystone.token.backends.sql.Token
30 +driver = keystone.token.backends.sql.Token
31
32 # Amount of time a token should remain valid (in seconds)
33@@ -63,7 +63,7 @@
34
35 [ec2]
36 -# driver = keystone.contrib.ec2.backends.kvs.Ec2
37-+driver = keystone.contrib.ec2.backends.sql.Ec2
38++driver = keystone.contrib.ec2.backends.kvs.Ec2
39
40 [ssl]
41 #enable = True

Subscribers

People subscribed via source and target branches