[Branch ~upstart-devel/upstart/trunk] Rev 1409: * Sync with lp:upstart.

[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-udev-bridge-man/+merge/140673
  proposed by: Stéphane Graber (stgraber)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~xnox/upstart/test-static/+merge/140655
  proposed by: Dmitrijs Ledkovs (xnox)
  review: Approve - James Hunt (jamesodhunt)
  https://code.launchpad.net/~xnox/upstart/utmp-usleep/+merge/140490
  proposed by: Dmitrijs Ledkovs (xnox)
  review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1409 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart-setenv+getenv
timestamp: Wed 2012-12-19 16:26:47 +0000
message:
  * Sync with lp:upstart.
added:
  init/tests/test_conf_static.c
modified:
  extra/man/upstart-udev-bridge.8
  init/Makefile.am
  init/conf.c
  init/conf.h
  init/tests/test_conf.c
  init/tests/test_job_process.c
  util/tests/test_sysv.c
  util/tests/test_utmp.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: 9618 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130131/e7f9eac5/attachment-0001.diff>