Ubuntu
upstart package

Merge lp://qastaging/~jamesodhunt/ubuntu/precise/upstart/ffe-bug-962124 into lp://qastaging/ubuntu/precise/upstart

  1. Precise (12.04)
  2. ffe-bug-962124
  3. Merge into precise
Proposed by James Hunt
Status: Work in progress
Proposed branch: lp://qastaging/~jamesodhunt/ubuntu/precise/upstart/ffe-bug-962124
Merge into: lp://qastaging/ubuntu/precise/upstart
Diff against target: 22 lines (+3/-1)
2 files modified
debian/changelog (+2/-0)
debian/conf/flush-early-job-log.conf (+1/-1)
To merge this branch: bzr merge lp://qastaging/~jamesodhunt/ubuntu/precise/upstart/ffe-bug-962124
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Ubuntu branches Pending
Review via email: mp+99524@code.qastaging.launchpad.net

Description of the change

Doc changes only.

  * init/man/init.8: Remove duplicate telinit(8).
  * debian/manpages/upstart-events.7:
    - Added table 'Job Goals and State Transitions'.
    - Corrected errors and omissions in 'Job Lifecycle' section.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

@James: upstart 1.5 is already in precise, can you please add a new changelog for it?
Also, the above merge description doesn't match at all the content. Please repropose a new branch with the correct rationale :)

review: Needs Fixing
Reply

Unmerged revisions

1382. By James Hunt

debian/conf/flush-early-job-log.conf: Change initctl command from
'flush-early-job-log' to 'notify-disk-writeable' to reflect new name.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: