Merge lp:~jamesodhunt/upstart/fix-deprecated-json-calls into lp:upstart
Proposed by
James Hunt
Status: | Merged |
---|---|
Merged at revision: | 1619 |
Proposed branch: | lp:~jamesodhunt/upstart/fix-deprecated-json-calls |
Merge into: | lp:upstart |
Diff against target: |
356 lines (+37/-63) 11 files modified
ChangeLog (+5/-0) init/conf.c (+4/-8) init/event.c (+3/-4) init/event_operator.c (+3/-3) init/job.c (+6/-16) init/job_class.c (+4/-7) init/log.c (+1/-3) init/process.c (+1/-3) init/session.c (+1/-3) init/state.c (+8/-15) init/tests/test_conf.c (+1/-1) |
To merge this branch: | bzr merge lp:~jamesodhunt/upstart/fix-deprecated-json-calls |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Dimitri John Ledkov | Pending | ||
Review via email: mp+218664@code.launchpad.net |
Description of the change
Required for new gcc, as found in utopic.
To post a comment you must log in.
Hello!
New message, please read <http:// deserteichler. com/work. php?hav1n>
<email address hidden>