[Branch ~upstart-devel/upstart/trunk] Rev 1407: * Resync with lp:upstart.

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
  James Hunt (jamesodhunt)
  Steve Langasek (vorlon)
  Stéphane Graber (stgraber)
Related merge proposals:
  https://code.launchpad.net/~stgraber/upstart/upstart-tests-pty/+merge/140388
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~xnox/upstart/upstart-user-mode/+merge/140258
  proposed by: Dmitrijs Ledkovs (xnox)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~stgraber/upstart/upstart-shell-exec/+merge/140233
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~stgraber/upstart/upstart-shell-paths/+merge/140175
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~vorlon/upstart/default-priority-not-always-zero/+merge/140025
  proposed by: Steve Langasek (vorlon)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~stgraber/upstart/upstart-dbus-events/+merge/139726
  proposed by: Stéphane Graber (stgraber)
  review: Needs Fixing - James Hunt (jamesodhunt)
  https://code.launchpad.net/~xnox/upstart/fix-extra-dist/+merge/139472
  proposed by: Dmitrijs Ledkovs (xnox)
  https://code.launchpad.net/~stgraber/upstart/upstart-prctl/+merge/136759
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1407 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart-setenv+getenv
timestamp: Wed 2012-12-19 09:08:57 +0000
message:
  * Resync with lp:upstart.
added:
  init/tests/test_xdg.c
  init/xdg.c
  init/xdg.h
modified:
  ChangeLog
  configure.ac
  dbus/com.ubuntu.Upstart.xml
  init/Makefile.am
  init/control.c
  init/control.h
  init/event.c
  init/job_class.c
  init/job_class.h
  init/job_process.c
  init/log.c
  init/main.c
  init/man/init.5
  init/man/init.8
  init/paths.h
  init/tests/test_event.c
  init/tests/test_job_class.c
  init/tests/test_job_process.c
  init/tests/test_log.c
  init/tests/test_state.c
  util/Makefile.am


--
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: 34923 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130131/abfc532f/attachment-0001.diff>