← Back to branch summary

~vorlon/ubuntu/raring/upstart/lp.1199778

~vorlon/ubuntu/raring/upstart/lp.1199778

Viewing all changes in revision 1182.14.43.

Committer: James Hunt
Date: 2011-06-06 13:16:33 UTC
mfrom: (1182.12.4 upstart-override-support)
mto: (1182.45.1 stateful-reexec) (1316.1.1 ubuntu-upstart) (1185.1.14 upstream)
mto: This revision was merged to the branch mainline in revision 1317.
Revision ID: james.hunt@ubuntu.com-20110606131633-vluponfkoggc8573

Merge of lp:~jamesodhunt/upstart/upstream-override-support.

files modified:
ChangeLog

init/conf.c

init/conf.h

init/job_class.c

init/man/init.5

init/parse_conf.c

init/parse_job.c

init/parse_job.h

init/paths.h

init/tests/test_conf.c

init/tests/test_parse_job.c

po/upstart.pot

scripts/init-checkconf.sh *

scripts/initctl2dot.py *

Show diffs side-by-side

added added

removed removed

init/job_class.c

init/man/init.5

init/parse_conf.c

init/parse_job.c

init/parse_job.h

init/tests/test_conf.c

init/tests/test_parse_job.c

Older »