[Branch ~upstart-devel/upstart/trunk] Rev 1476: Merge of lp:~mdeslaur/upstart/apparmor-support.

[noreply at launchpad.net]

Merge authors:
  Marc Deslauriers (mdeslaur)
Related merge proposals:
  https://code.launchpad.net/~mdeslaur/upstart/apparmor-support/+merge/164169
  proposed by: Marc Deslauriers (mdeslaur)
  review: Approve - Stéphane Graber (stgraber)
  review: Resubmit - Marc Deslauriers (mdeslaur)
------------------------------------------------------------
revno: 1476 [merge]
committer: James Hunt <james.hunt at ubuntu.com>
branch nick: upstart
timestamp: Tue 2013-05-28 13:12:29 +0100
message:
  Merge of lp:~mdeslaur/upstart/apparmor-support.
added:
  init/apparmor.c
  init/apparmor.h
  init/tests/data/upstart-pre-security.json
modified:
  ChangeLog
  init/Makefile.am
  init/errors.h
  init/job.c
  init/job.h
  init/job_class.c
  init/job_class.h
  init/job_process.c
  init/job_process.h
  init/man/init.5
  init/parse_job.c
  init/process.c
  init/process.h
  init/tests/test_job.c
  init/tests/test_job_class.c
  init/tests/test_parse_job.c
  init/tests/test_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: 55925 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130528/e5efba48/attachment-0001.diff>