[Branch ~upstart-devel/upstart/trunk] Rev 1642: Merge lp:~jamesodhunt/upstart/bug-1302117-remerged

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1302117-remerged/+merge/225177
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Dimitri John Ledkov (xnox)
------------------------------------------------------------
revno: 1642 [merge]
fixes bug: https://launchpad.net/bugs/1302117
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Mon 2014-07-07 17:39:49 +0100
message:
  Merge lp:~jamesodhunt/upstart/bug-1302117-remerged
modified:
  ChangeLog
  init/log.c
  init/tests/test_job_process.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: 6394 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140707/614c1213/attachment.diff>