Ubuntu
keystone package

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

  1. Saucy (13.10)
  2. lp1190038
  3. Merge into havana
Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
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 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
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-06 18:10:33 +0000
+++ debian/changelog 2013-06-11 20:12:26 +0000
@@ -2,6 +2,8 @@
22
3 [ Adam Gandelman ]3 [ Adam Gandelman ]
4 * debian/patches/*: Refresh4 * debian/patches/*: Refresh
5 * debian/keystone.install: Install keystone-paste.ini to /etc/keystone.
6 (LP: #1190038)
57
6 [ Yolanda Robla ]8 [ Yolanda Robla ]
7 * debian/tests: added autopkgtests9 * debian/tests: added autopkgtests
810
=== modified file 'debian/keystone.install'
--- debian/keystone.install 2012-07-30 19:24:40 +0000
+++ debian/keystone.install 2013-06-11 20:12:26 +0000
@@ -1,6 +1,7 @@
1usr/bin/*1usr/bin/*
2etc/keystone.conf.sample usr/share/keystone2etc/keystone.conf.sample usr/share/keystone
3etc/default_catalog.templates etc/keystone3etc/default_catalog.templates etc/keystone
4etc/keystone/keystone-paste.ini etc/keystone
4etc/policy.json etc/keystone5etc/policy.json etc/keystone
5tools/sample_data.sh usr/share/keystone6tools/sample_data.sh usr/share/keystone
6tools/convert_to_sqlite.sh usr/share/keystone7tools/convert_to_sqlite.sh usr/share/keystone

Subscribers

People subscribed via source and target branches