Created by James Hunt on 2014-07-01 and last modified on 2014-07-07
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-1302117-remerged
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

James Hunt

Recent revisions

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

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.