Merge lp:~jamesodhunt/upstart/bug-1269731 into lp:upstart
Proposed by
James Hunt
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1591 | ||||
Proposed branch: | lp:~jamesodhunt/upstart/bug-1269731 | ||||
Merge into: | lp:upstart | ||||
Diff against target: |
295 lines (+149/-18) 7 files modified
ChangeLog (+23/-0) init/conf.c (+16/-2) init/job_class.c (+3/-0) init/tests/test_conf.c (+77/-12) scripts/pyupstart.py (+3/-2) scripts/tests/test_pyupstart_session_init.py (+15/-2) scripts/tests/test_pyupstart_system_init.py (+12/-0) |
||||
To merge this branch: | bzr merge lp:~jamesodhunt/upstart/bug-1269731 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
Note that the Python scenario tests will fail unless /sbin/init on the test system actually has the fix for bug 1269731. This will be much easier to test once lp:~jamesodhunt/upstart/fix-python-tests gets merged into lp:upstart since that allows the tests to run against different Upstart binaries.