lp:~vorlon/upstart/stateful-reexec-confsource

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~upstart-devel/upstart/stateful-reexec at revision 1438

James Hunt: Pending requested 2012-09-10

Diff: 1469 lines (+401/-596)

8 files modified

init/event.c (+29/-35)
init/job.c (+148/-223)
init/job_class.c (+133/-212)
init/log.c (+43/-37)
init/log.h (+1/-1)
init/process.c (+12/-32)
init/session.c (+35/-39)
init/state.h (+0/-17)

api

Merged into lp:~jamesodhunt/upstart/stateful-reexec at revision 1438

James Hunt: Pending requested 2012-08-28

Diff: 3037 lines (+650/-1298)

25 files modified

ChangeLog (+4/-0)
dbus/com.ubuntu.Upstart.xml (+0/-8)
init/Makefile.am (+1/-1)
init/conf.c (+10/-51)
init/conf.h (+3/-3)
init/control.c (+28/-482)
init/control.h (+1/-22)
init/errors.h (+0/-2)
init/event.c (+32/-47)
init/event_operator.c (+1/-1)
init/job.c (+159/-218)
init/job_class.c (+210/-240)
init/job_class.h (+2/-0)
init/log.c (+121/-60)
init/log.h (+2/-2)
init/main.c (+7/-4)
init/parse_job.c (+1/-1)
init/paths.h (+0/-28)
init/process.c (+12/-32)
init/session.c (+35/-43)
init/state.c (+3/-25)
init/state.h (+9/-19)
init/tests/test_conf.c (+1/-1)
init/tests/test_control.c (+7/-7)
init/tests/test_event_operator.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1448. By Steve Langasek on 2012-09-11

adjust comments to reflect the code that's changed

1447. By Steve Langasek on 2012-09-11

Resync with the main branch

1446. By Steve Langasek on 2012-09-10

Resync with the main branch

1445. By Steve Langasek on 2012-09-10

Finally, drop the comments in state.h about the right way to deserialize
involving returning partial objects; there's just no need for allocating
twice and copying contents around when we can just make sure we always
deserialize the bits needed for the object constructor first, then populate
everything in one go.

1444. By Steve Langasek on 2012-09-10

clean up 'partial' handling of Session deserialization

1443. By Steve Langasek on 2012-09-10

clean up 'partial' handling of Process deserialization

1442. By Steve Langasek on 2012-09-10

Resync with the main branch

1441. By Steve Langasek on 2012-09-10

clean up 'partial' handling of Log deserialization

1440. By Steve Langasek on 2012-09-10

Resync with the main branch

1439. By Steve Langasek on 2012-09-10

clean up 'partial' handling for Event deserialization