Merge lp:~gandelman-a/ubuntu/saucy/keystone/lp1190038 into lp:~openstack-ubuntu-testing/keystone/havana

Proposed by Adam Gandelman on 2013-06-11
Status: Merged
Approved by: Chuck Short on 2013-06-12
Approved revision: 201
Merged at revision: 201
Proposed branch: lp:~gandelman-a/ubuntu/saucy/keystone/lp1190038
Merge into: lp:~openstack-ubuntu-testing/keystone/havana
Diff against target: 24 lines (+3/-0)
2 files modified
debian/changelog (+2/-0)
debian/keystone.install (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/keystone/lp1190038
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers 2013-06-11 Pending
Review via email: mp+168801@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 2013-06-06 18:10:33 +0000
3+++ debian/changelog 2013-06-11 20:12:26 +0000
4@@ -2,6 +2,8 @@
5
6 [ Adam Gandelman ]
7 * debian/patches/*: Refresh
8+ * debian/keystone.install: Install keystone-paste.ini to /etc/keystone.
9+ (LP: #1190038)
10
11 [ Yolanda Robla ]
12 * debian/tests: added autopkgtests
13
14=== modified file 'debian/keystone.install'
15--- debian/keystone.install 2012-07-30 19:24:40 +0000
16+++ debian/keystone.install 2013-06-11 20:12:26 +0000
17@@ -1,6 +1,7 @@
18 usr/bin/*
19 etc/keystone.conf.sample usr/share/keystone
20 etc/default_catalog.templates etc/keystone
21+etc/keystone/keystone-paste.ini etc/keystone
22 etc/policy.json etc/keystone
23 tools/sample_data.sh usr/share/keystone
24 tools/convert_to_sqlite.sh usr/share/keystone

Subscribers

People subscribed via source and target branches