Merge lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/proposed into lp://qastaging/ubuntu/natty/upstart
Proposed by
James Hunt
| Status: | Merged |
|---|---|
| Merged at revision: | 1296 |
| Proposed branch: | lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/proposed |
| Merge into: | lp://qastaging/ubuntu/natty/upstart |
| Diff against target: |
14087 lines (+6461/-2151) 59 files modified
.bzrignore (+64/-0) ChangeLog (+42/-0) Makefile.am (+1/-1) Makefile.in (+1/-1) NEWS (+34/-0) configure (+49/-54) configure.ac (+7/-5) contrib/Makefile.am (+2/-1) contrib/Makefile.in (+2/-1) contrib/bash_completion/upstart (+180/-0) dbus/Upstart.conf (+6/-36) dbus/com.ubuntu.Upstart.xml (+7/-0) debian/changelog (+26/-0) debian/control (+1/-1) extra/Makefile.am (+106/-0) extra/Makefile.in (+837/-0) extra/conf/upstart-udev-bridge.conf (+14/-0) extra/man/upstart-udev-bridge.8 (+35/-0) extra/upstart-socket-bridge.c (+644/-0) extra/upstart-udev-bridge.c (+310/-0) init/Makefile.am (+25/-2) init/Makefile.in (+386/-279) init/conf.c (+495/-53) init/conf.h (+44/-1) init/control.c (+73/-12) init/control.h (+4/-0) init/event.c (+22/-1) init/event.h (+6/-1) init/event_operator.c (+59/-0) init/event_operator.h (+8/-0) init/job.c (+38/-0) init/job.h (+4/-1) init/job_class.c (+79/-9) init/job_class.h (+5/-1) init/job_process.c (+31/-1) init/man/init.5 (+144/-23) init/man/init.8 (+2/-1) init/parse_conf.c (+6/-0) init/parse_job.c (+20/-6) init/parse_job.h (+4/-2) init/paths.h (+59/-0) init/session.c (+266/-0) init/session.h (+62/-0) init/tests/test_blocked.c (+6/-1) init/tests/test_conf.c (+1312/-10) init/tests/test_control.c (+12/-9) init/tests/test_event.c (+40/-25) init/tests/test_job.c (+145/-72) init/tests/test_job_class.c (+142/-59) init/tests/test_job_process.c (+298/-29) init/tests/test_parse_job.c (+282/-243) po/POTFILES.in (+2/-0) udev/Makefile.am (+0/-67) udev/Makefile.in (+0/-779) udev/conf/upstart-udev-bridge.conf (+0/-14) udev/man/upstart-udev-bridge.8 (+0/-35) udev/upstart-udev-bridge.c (+0/-310) util/man/initctl.8 (+8/-4) util/shutdown.c (+4/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jamesodhunt/ubuntu/natty/upstart/proposed |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This is "Stage 1" comprising branches (1)-(3) inclusive. See bug 723846.
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 one obvious thing I see here is that the D-Bus policy is current upstream (i.e. all users have access), rather than what we agreed upon whereby we go back to the previous D-Bus policy until such time as user session support has comprehensive test suite coverage, so that we have some assurance that we're not introducing security vulnerabilities.
As discussed with James on IRC, I'll fix this up locally as he needs to go out and Alpha 3 is approaching.