[Branch ~upstart-devel/upstart/trunk] Rev 1645: Merge race fixes

[noreply at launchpad.net]

Merge authors:
  Dimitri John Ledkov (xnox)
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~xnox/upstart/shrink-notifications/+merge/225200
  proposed by: Dimitri John Ledkov (xnox)
  review: Needs Fixing - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1645 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Fri 2014-07-11 17:36:49 +0100
message:
  Merge race fixes
modified:
  ChangeLog
  init/job.c
  init/job_process.c
  init/job_process.h
  init/tests/test_job_process.c
  test/test_util_common.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: 46835 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140711/f3f1b747/attachment-0001.diff>