OpenStack Identity (keystone)

Merge lp:~zulcss/keystone/keystone-fix into lp:~openstack-ubuntu-testing/keystone/grizzly

  1. keystone-fix
  2. Merge into grizzly
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 174
Merged at revision: 174
Proposed branch: lp:~zulcss/keystone/keystone-fix
Merge into: lp:~openstack-ubuntu-testing/keystone/grizzly
Diff against target: 16 lines (+4/-4)
1 file modified
debian/patches/sql_connection.patch (+4/-4)
To merge this branch: bzr merge lp:~zulcss/keystone/keystone-fix
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+147952@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/sql_connection.patch'
2--- debian/patches/sql_connection.patch 2013-02-04 17:58:12 +0000
3+++ debian/patches/sql_connection.patch 2013-02-12 15:05:22 +0000
4@@ -1,8 +1,8 @@
5-diff -Naupr keystone.orig/etc/keystone.conf.sample keystone/etc/keystone.conf.sample
6---- keystone.orig/etc/keystone.conf.sample 2013-02-04 11:55:08.277261181 -0600
7-+++ keystone/etc/keystone.conf.sample 2013-02-04 11:57:14.985261242 -0600
8+diff -Naurp keystone-2013.1.orig/etc/keystone.conf.sample keystone-2013.1/etc/keystone.conf.sample
9+--- keystone-2013.1.orig/etc/keystone.conf.sample 2013-02-12 08:29:21.000000000 -0600
10++++ keystone-2013.1/etc/keystone.conf.sample 2013-02-12 08:38:16.984645736 -0600
11 @@ -36,10 +36,10 @@
12- # debug = False
13+ # verbose = False
14
15 # Name of log file to output to. If not set, logging will go to stdout.
16 -# log_file = keystone.log

Subscribers

People subscribed via source and target branches