lp://staging/~jamesodhunt/upstart/bug-1302117-remerged

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/upstart at revision 1642

Dimitri John Ledkov (community): Approve on 2014-07-07

Diff: 242 lines (+119/-4)

4 files modified

ChangeLog (+14/-0)
init/log.c (+12/-0)
init/tests/test_job_process.c (+17/-4)
util/tests/test_initctl.c (+76/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1643. By James Hunt on 2014-07-07

* init/tests/test_job_process.c: test_handler():
  - Remove logs generated by PROCESS_MAIN. This wasn't necessary before
    due to the manifestation of LP: #1302117 not restoring the correct
    umask.

1642. By James Hunt on 2014-07-03

* Sync with lp:upstart.

1641. By James Hunt on 2014-07-01

* Re-merge fix for LP: #1302117.

1640. By James Hunt on 2014-07-01

* init/cgroup.c: cgroup_chown(): Corrected return value details.

1639. By James Hunt on 2014-07-01

* init/cgroup.h: Remove stale comment.

1638. By James Hunt on 2014-06-27

* Merge of lp:~xnox/upstart/do-not-emit-twice.

1637. By James Hunt on 2014-06-12

* Formatting.

1636. By James Hunt on 2014-06-09

* Function header.

1635. By James Hunt on 2014-06-09

* Decrufting.

1634. By Dimitri John Ledkov on 2014-06-05

Merge cgroups work.