Merge lp:~xnox/upstart/fix-1234841 into lp:upstart

Proposed by Dimitri John Ledkov on 2013-10-04
Status: Merged
Merged at revision: 1540
Proposed branch: lp:~xnox/upstart/fix-1234841
Merge into: lp:upstart
Diff against target: 12 lines (+1/-1)
1 file modified
extra/conf-session/upstart-file-bridge.conf (+1/-1)
To merge this branch: bzr merge lp:~xnox/upstart/fix-1234841
Reviewer Review Type Date Requested Status
Steve Langasek 2013-10-04 Pending
Review via email:

This proposal supersedes a proposal from 2013-10-03.

To post a comment you must log in.
Steve Langasek (vorlon) wrote : Posted in a previous version of this proposal

'startup and started dbus'> should be written 'started dbus'; if you're not starting directly on the startup event, this is redundant to include here.

review: Needs Fixing
James Hunt (jamesodhunt) wrote : Posted in a previous version of this proposal


review: Approve
lp:~xnox/upstart/fix-1234841 updated on 2013-10-04
1540. By James Hunt on 2013-10-04

* Merge of lp:~xnox/upstart/fix-1234841.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extra/conf-session/upstart-file-bridge.conf'
2--- extra/conf-session/upstart-file-bridge.conf 2013-07-18 14:12:13 +0000
3+++ extra/conf-session/upstart-file-bridge.conf 2013-10-04 12:19:15 +0000
4@@ -7,7 +7,7 @@
6 emits file
8-start on startup
9+start on started dbus
10 stop on session-end
12 expect daemon


People subscribed via source and target branches