[Branch ~upstart-devel/upstart/trunk] Rev 1619: * Merge of lp:~jamesodhunt/upstart/fix-deprecated-json-calls.

[noreply at launchpad.net]

Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/fix-deprecated-json-calls/+merge/218664
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Colin Watson (cjwatson)
------------------------------------------------------------
revno: 1619 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart
timestamp: Thu 2014-05-08 08:55:40 +0100
message:
  * Merge of lp:~jamesodhunt/upstart/fix-deprecated-json-calls.
modified:
  ChangeLog
  init/conf.c
  init/event.c
  init/event_operator.c
  init/job.c
  init/job_class.c
  init/log.c
  init/process.c
  init/session.c
  init/state.c
  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: 10916 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140508/5e834fcf/attachment-0001.diff>