[Branch ~upstart-devel/upstart/trunk] Rev 1479: Merge lp:~jamesodhunt/upstart/serialise-remaining-objects

[noreply at launchpad.net]

Merge authors:
  Dmitrijs Ledkovs (xnox)
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/serialise-remaining-objects/+merge/163151
  proposed by: James Hunt (jamesodhunt)
  review: Resubmit - James Hunt (jamesodhunt)
  review: Needs Fixing - Steve Langasek (vorlon)
------------------------------------------------------------
revno: 1479 [merge]
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
branch nick: upstart
timestamp: Thu 2013-06-06 11:50:53 +0100
message:
  Merge lp:~jamesodhunt/upstart/serialise-remaining-objects
added:
  init/tests/data/upstart-1.8+apparmor.json
  init/tests/data/upstart-1.8+full_serialisation+apparmor.json
  init/tests/data/upstart-1.8+full_serialisation-apparmor.json
  init/tests/data/upstart-1.8.json
modified:
  .bzrignore
  ChangeLog
  init/Makefile.am
  init/conf.c
  init/conf.h
  init/control.h
  init/event.c
  init/event_operator.c
  init/event_operator.h
  init/job.c
  init/job.h
  init/job_class.c
  init/job_class.h
  init/main.c
  init/paths.h
  init/state.c
  init/state.h
  init/tests/test_conf.c
  init/tests/test_event_operator.c
  init/tests/test_job.c
  init/tests/test_state.c
  init/tests/test_util.c
  init/tests/test_util.h


--
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: 1620024 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130607/815a148b/attachment-0001.diff>