Merge lp:~jamesodhunt/upstart/bug-1258098 into lp:upstart
Proposed by
James Hunt
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1606 | ||||
Proposed branch: | lp:~jamesodhunt/upstart/bug-1258098 | ||||
Merge into: | lp:upstart | ||||
Diff against target: |
251 lines (+140/-8) (has conflicts) 5 files modified
ChangeLog (+15/-0) init/control.c (+63/-0) init/control.h (+10/-8) init/state.c (+31/-0) util/tests/test_initctl.c (+21/-0) Text conflict in ChangeLog |
||||
To merge this branch: | bzr merge lp:~jamesodhunt/upstart/bug-1258098 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Needs Information | ||
Review via email: mp+202458@code.launchpad.net |
To post a comment you must log in.
The code looks ok, the test is not passing for me:
not ok 5 - ensure Session Init retains D-Bus address across a re-exec common. c:132 (wait_for_upstart).
wrong value for running, expected 1 got 0
at test_util_
Aborted (core dumped)
Also note: https:/ /bugs.launchpad .net/upstart/ +bug/1288243