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

Proposed by Chuck Short on 2013-03-18
Status: Merged
Merged at revision: 184
Proposed branch: lp:~zulcss/keystone/keystone-upstart
Merge into: lp:~openstack-ubuntu-testing/keystone/grizzly
Diff against target: 25 lines (+3/-1)
2 files modified
debian/changelog (+2/-0)
debian/keystone.upstart (+1/-1)
To merge this branch: bzr merge lp:~zulcss/keystone/keystone-upstart
Reviewer Review Type Date Requested Status
Adam Gandelman 2013-03-18 Approve on 2013-03-18
Review via email: mp+153927@code.launchpad.net
To post a comment you must log in.
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-03-11 23:12:25 +0000
3+++ debian/changelog 2013-03-18 20:24:41 +0000
4@@ -17,6 +17,8 @@
5 * debian/control:Clean-up depends:
6 - Dropped python-prettytable no longer needed.
7 * Update standards
8+ * debian/keystone.upstart: Start on runlevel [2345]
9+ (LP: #1153988)
10
11 [ Adam Gandelman ]
12 * debian/keystone.postinst: Run pki_setup during configure to intitialize
13
14=== modified file 'debian/keystone.upstart'
15--- debian/keystone.upstart 2012-11-25 23:10:56 +0000
16+++ debian/keystone.upstart 2013-03-18 20:24:41 +0000
17@@ -1,7 +1,7 @@
18 description "Keystone API server"
19 author "Soren Hansen <soren@linux2go.dk>"
20
21-start on (local-filesystems and net-device-up IFACE!=lo)
22+start on runlevel [2345]
23 stop on runlevel [!2345]
24
25 respawn

Subscribers

People subscribed via source and target branches