Merge lp://qastaging/~jamesodhunt/ubuntu/oneiric/upstart/1.3 into lp://qastaging/ubuntu/oneiric/upstart

Proposed by James Hunt
Status: Merged
Merged at revision: 1317
Proposed branch: lp://qastaging/~jamesodhunt/ubuntu/oneiric/upstart/1.3
Merge into: lp://qastaging/ubuntu/oneiric/upstart
Diff against target: 11841 lines (+2785/-3932)
64 files modified
ChangeLog (+410/-435)
NEWS (+67/-98)
TESTING.sessions (+263/-0)
TODO (+1/-7)
configure (+16/-16)
configure.ac (+4/-4)
contrib/bash_completion/upstart (+65/-29)
contrib/vim/syntax/upstart.vim (+61/-22)
debian/changelog (+21/-0)
extra/Makefile.am (+0/-1)
extra/conf/upstart-socket-bridge.conf (+0/-16)
extra/man/socket-event.7 (+0/-92)
extra/man/upstart-socket-bridge.8 (+0/-47)
extra/upstart-socket-bridge.c (+1/-1)
init/Makefile.am (+0/-13)
init/Makefile.in (+246/-306)
init/conf.c (+10/-8)
init/conf.h (+1/-1)
init/control.c (+2/-2)
init/control.h (+1/-1)
init/environ.c (+1/-57)
init/environ.h (+0/-1)
init/errors.h (+4/-1)
init/event.c (+2/-1)
init/job.c (+1/-1)
init/job_class.c (+6/-4)
init/job_class.h (+4/-2)
init/job_process.c (+86/-31)
init/job_process.h (+13/-2)
init/main.c (+95/-20)
init/man/init.5 (+58/-10)
init/man/init.8 (+3/-4)
init/parse_job.c (+69/-17)
init/parse_job.h (+1/-1)
init/paths.h (+9/-20)
init/session.c (+1/-1)
init/session.h (+1/-1)
init/system.c (+5/-11)
init/system.h (+1/-1)
init/tests/test_conf.c (+146/-0)
init/tests/test_control.c (+0/-38)
init/tests/test_environ.c (+0/-107)
init/tests/test_job_class.c (+5/-4)
init/tests/test_job_process.c (+10/-26)
init/tests/test_parse_job.c (+409/-8)
init/tests/test_system.c (+3/-3)
po/ChangeLog (+8/-0)
po/POTFILES.in (+1/-0)
po/en@boldquot.po (+211/-142)
po/en@quot.po (+211/-142)
po/upstart.pot (+209/-140)
scripts/Makefile.am (+0/-25)
scripts/Makefile.in (+0/-543)
scripts/init-checkconf.sh (+0/-248)
scripts/initctl2dot.py (+0/-571)
scripts/man/init-checkconf.8 (+0/-73)
scripts/man/initctl2dot.8 (+0/-87)
util/Makefile.am (+10/-0)
util/Makefile.in (+15/-4)
util/initctl.c (+6/-20)
util/initctl.h (+0/-458)
util/man/initctl.8 (+7/-4)
util/reboot.c (+1/-0)
util/tests/test_initctl.c (+4/-4)
To merge this branch: bzr merge lp://qastaging/~jamesodhunt/ubuntu/oneiric/upstart/1.3
Reviewer Review Type Date Requested Status
Colin Watson Pending
Review via email: mp+64969@code.qastaging.launchpad.net

Description of the change

Upstream Upstart 1.3 release.

Original source tarball for Upstart 1.3 is here:

http://launchpad.net/upstart/1.x/1.3/+download/upstart-1.3.tar.gz

Also:

http://launchpad.net/upstart/1.x/1.3/+download/upstart-1.3.tar.gz.asc
http://launchpad.net/upstart/1.x/1.3/+download/upstart-1.3.tar.gz/+md5

Note that we still have user sessions disabled (via D-Bus policy).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: