[Branch ~upstart-devel/upstart/trunk] Rev 1561: Merge lp:~jamesodhunt/upstart/bug-1238078

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1238078/+merge/190723
  proposed by: James Hunt (jamesodhunt)
  review: Needs Fixing - Steve Langasek (vorlon)
------------------------------------------------------------
revno: 1561 [merge]
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Wed 2013-11-06 19:35:14 -0800
message:
  Merge lp:~jamesodhunt/upstart/bug-1238078
added:
  init/tests/data/upstart-1.11.json
renamed:
  init/tests/data/upstart-reload-signal.json => init/tests/data/upstart-1.9.json
modified:
  ChangeLog
  init/Makefile.am
  init/job_class.c
  init/job_class.h
  init/state.c
  init/tests/test_state.c
  test/test_util_common.c
  test/test_util_common.h
  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: 540853 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20131107/5b0df3e9/attachment-0001.diff>