lp:~vorlon/upstart/lp.1235480

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart

Stéphane Graber (community): Approve on 2013-10-04

Diff: 56 lines (+9/-4)

3 files modified

ChangeLog (+5/-0)
extra/man/upstart-local-bridge.8 (+3/-3)
extra/upstart-local-bridge.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1235480: upstart-local-bridge clobbers $PATH with its events

Undecided

Fix Committed

Link a bug report

Related blueprints

1543. By Steve Langasek on 2013-10-04

Update the manpage to match

1542. By Steve Langasek on 2013-10-04

use SOCKET_PATH in our event environment, instead of clobbering PATH.

1541. By Dimitri John Ledkov on 2013-10-04

merge lp:~jamesodhunt/upstart/bug-1234898

1540. By James Hunt on 2013-10-04

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

1539. By Dimitri John Ledkov on 2013-10-03

Merge lp:~jamesodhunt/upstart/bug-1089159

1538. By James Hunt on 2013-10-02

* test/test_util_common.c:
  - set_upstart_session(): Call get_initctl_binary() rather than using
    define value.
  - get_initctl(): As above.
  - get_initctl_binary(): Check that file exists for parity with
    get_upstart_binary().

1537. By James Hunt on 2013-10-01

* extra/upstart-file-bridge.c:
  - upstart_job_added(): Make quieter in manner consistent with other
    bridges (only display output in debug mode).
  - upstart_job_removed(): As above.

1536. By James Hunt on 2013-10-01

* init/job_process.c:job_process_jobs_running(): Removed unused
  variables.

1535. By Dimitri John Ledkov on 2013-10-01

Merge lp:~jamesodhunt/upstart/bypass-quiesce-logic-for-pid1

1534. By Dimitri John Ledkov on 2013-09-27

Merge lp:~jamesodhunt/upstart/bug-1227212