[Branch ~upstart-devel/upstart/trunk] Rev 1420: * Merge of lp:~jamesodhunt/upstart/remove-basic-user-sessions.

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
  James Hunt (jamesodhunt)
  Stéphane Graber (stgraber)
Related merge proposals:
  https://code.launchpad.net/~stgraber/upstart/upstart-make-event-bridge-usable/+merge/144399
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~stgraber/upstart/upstart-session-socket/+merge/143344
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1096531/+merge/143314
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Colin Watson (cjwatson)
  https://code.launchpad.net/~xnox/upstart/user-log-dir/+merge/143091
  proposed by: Dmitrijs Ledkovs (xnox)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~stgraber/upstart/upstart-event-bridge-typo/+merge/142754
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~jamesodhunt/upstart/bug-881885/+merge/142540
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Colin Watson (cjwatson)
------------------------------------------------------------
revno: 1420 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart-setenv+getenv
timestamp: Fri 2013-01-25 20:02:26 +0000
message:
  * Merge of lp:~jamesodhunt/upstart/remove-basic-user-sessions.
    (Note: won't compile due to dependency of commit about to be applied).
removed:
  util/tests/test_user_sessions.sh
modified:
  ChangeLog
  dbus/Upstart.conf
  extra/conf/upstart-event-bridge.conf
  extra/upstart-event-bridge.c
  init/Makefile.am
  init/control.c
  init/control.h
  init/job.c
  init/job_class.c
  init/job_process.c
  init/log.c
  init/main.c
  init/man/init.5
  init/man/init.8
  init/session.c
  init/session.h
  init/state.c
  init/state.h
  init/tests/test_conf.c
  init/tests/test_state.c
  init/tests/test_xdg.c
  init/xdg.c
  init/xdg.h
  scripts/init-checkconf.sh
  util/initctl.c
  util/man/initctl.8
  util/tests/test_initctl.c


--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk

Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
-------------- next part --------------
A non-text attachment was scrubbed...
Name: revision-diff.txt
Type: text/x-diff
Size: 113966 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130131/02f3c001/attachment-0001.diff>