[Branch ~upstart-devel/upstart/trunk] Rev 1433: * Merge of lp:~jamesodhunt/upstart/upstart-shutdown.

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/upstart-shutdown/+merge/148676
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Stéphane Graber (stgraber)
------------------------------------------------------------
revno: 1433 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart
timestamp: Mon 2013-02-25 09:28:24 +0000
message:
  * Merge of lp:~jamesodhunt/upstart/upstart-shutdown.
added:
  init/man/session-end.7
  init/quiesce.c
  init/quiesce.h
modified:
  ChangeLog
  dbus/com.ubuntu.Upstart.xml
  init/Makefile.am
  init/conf.c
  init/conf.h
  init/control.c
  init/control.h
  init/events.h
  init/job_class.c
  init/job_class.h
  init/job_process.c
  init/job_process.h
  init/main.c
  init/man/init.8
  init/man/startup.7
  init/session.c
  init/session.h
  util/initctl.c
  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: 63787 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130225/dfa2519a/attachment-0001.diff>