[Branch ~upstart-devel/upstart/trunk] Rev 1634: Merge cgroups work.

[noreply at launchpad.net]

Merge authors:
  Dimitri John Ledkov (xnox)
  James Hunt (jamesodhunt)
  Serge Hallyn (serge-hallyn)
------------------------------------------------------------
revno: 1634 [merge]
committer: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
branch nick: trunk
timestamp: Thu 2014-06-05 23:35:01 +0100
message:
  Merge cgroups work.
added:
  init/cgroup.c
  init/cgroup.h
  init/tests/data/upstart-1.13.json
  init/tests/test_cgroup.c
modified:
  configure.ac
  dbus/com.ubuntu.Upstart.xml
  init/Makefile.am
  init/control.c
  init/errors.h
  init/event.c
  init/job.c
  init/job.h
  init/job_class.c
  init/job_class.h
  init/job_process.c
  init/job_process.h
  init/main.c
  init/man/init.5
  init/man/init.8
  init/parse_job.c
  init/state.c
  init/tests/test_job_class.c
  init/tests/test_parse_job.c
  init/tests/test_state.c
  lib/Makefile.am
  test/Makefile.am
  test/test_util_common.c
  test/test_util_common.h
  test/tests/test_util_check_env.c
  util/Makefile.am
  util/initctl.c
  util/man/initctl.8


--
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: 733380 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140605/f2a2278d/attachment-0001.diff>