[Branch ~upstart-devel/upstart/trunk] Rev 1484: merge multiple cmdline confdirs

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/allow-multiple-cmdline-confdirs/+merge/156512
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Dmitrijs Ledkovs (xnox)
  review: Resubmit - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1484 [merge]
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
branch nick: upstart
timestamp: Tue 2013-06-25 14:59:17 +0100
message:
  merge multiple cmdline confdirs
added:
  init/tests/test_main.c
  test/
  test/Makefile.am
  test/test_util_common.c
  test/test_util_common.h
modified:
  ChangeLog
  Makefile.am
  configure.ac
  init/Makefile.am
  init/main.c
  init/man/init.8
  init/state.c
  init/tests/test_conf.c
  init/tests/test_event_operator.c
  init/tests/test_job_process.c
  init/tests/test_log.c
  init/tests/test_state.c
  init/tests/test_util.c
  init/tests/test_util.h
  init/xdg.c
  po/upstart.pot
  util/Makefile.am
  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: 136278 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130625/07d1fe9f/attachment-0001.diff>