[Branch ~upstart-devel/upstart/trunk] Rev 1474: * Merge of lp:~jamesodhunt/upstart/bug-1157713-inotify-test-failures.

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1157713-inotify-test-failures/+merge/159334
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Dmitrijs Ledkovs (xnox)
------------------------------------------------------------
revno: 1474 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart
timestamp: Wed 2013-05-01 00:29:08 +0100
message:
  * Merge of lp:~jamesodhunt/upstart/bug-1157713-inotify-test-failures.
added:
  init/tests/test_conf_preload.sh.in
  init/tests/wrap_inotify.c
modified:
  ChangeLog
  init/Makefile.am
  init/tests/test_conf.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: 15374 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130430/3332b0e6/attachment.diff>