[Branch ~upstart-devel/upstart/trunk] Rev 1398: Merge fix for bug #1079715

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1079715/+merge/135388
  proposed by: James Hunt (jamesodhunt)
  review: Needs Fixing - Steve Langasek (vorlon)
------------------------------------------------------------
revno: 1398 [merge]
fixes bug: https://launchpad.net/bugs/1079715
committer: Steve Langasek <steve.langasek at canonical.com>
branch nick: upstream
timestamp: Thu 2012-12-06 08:40:17 -0800
message:
  Merge fix for bug #1079715
added:
  init/tests/data/
  init/tests/data/upstart-1.6.json
modified:
  ChangeLog
  dbus/com.ubuntu.Upstart.xml
  init/Makefile.am
  init/control.c
  init/control.h
  init/job_class.c
  init/session.h
  init/state.c
  init/state.h
  init/tests/test_job_process.c
  init/tests/test_state.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: 35194 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20121206/a85a7ebc/attachment-0001.diff>