Merge lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/proposed-stage2 into lp://qastaging/ubuntu/natty/upstart
| Status: | Merged |
|---|---|
| Merged at revision: | 1304 |
| Proposed branch: | lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/proposed-stage2 |
| Merge into: | lp://qastaging/ubuntu/natty/upstart |
| Diff against target: |
491 lines (+162/-86) 8 files modified
ChangeLog (+12/-0) NEWS (+5/-0) configure.ac (+1/-1) debian/changelog (+21/-0) debian/manpages/upstart-events.7 (+73/-66) init/tests/test_control.c (+4/-1) po/upstart.pot (+2/-2) scripts/initctl2dot.py (+44/-16) |
| To merge this branch: | bzr merge lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/proposed-stage2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
* debian/
- Corrected reference to Upstart man page (actually init).
- Changed to using proper troff quotes.
- Escaped dashes in event names.
- Updated date.
- Table 1:
- Improved name.
- Sorted columns: Events, References, and Notes.
- Added unmounted-
* init/tests/
* scripts/
- header(): Change default node to be an event to simplify handling
globs in 'emits' stanzas.
- footer(): Updated for glob event nodes.
- sanitize(): Protect against glob syntax.
- show_event(): Update for glob event nodes.
- show_job(): Explicit specification of record node.
- show_edges(): Handle 'emits' glob syntax.
| Colin Watson (cjwatson) | # |
