[lxc-devel] [lxc/lxc] d21114: init: Support older apparmor

GitHub noreply at github.com
Thu Aug 27 20:10:41 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: d2111444dddddb706c29e4f2f46047dfca8c59ce
      https://github.com/lxc/lxc/commit/d2111444dddddb706c29e4f2f46047dfca8c59ce
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

  Changed paths:
    M config/init/systemd/lxc-apparmor-load
    M config/init/upstart/lxc.conf

  Log Message:
  -----------
  init: Support older apparmor

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 6a082d5a1370cd57ed05cf24aa800ae73112e818
      https://github.com/lxc/lxc/commit/6a082d5a1370cd57ed05cf24aa800ae73112e818
  Author: Antonio Terceiro <terceiro at debian.org>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: support stretch (Debian 9) images

Signed-off-by: Antonio Terceiro <terceiro at debian.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: c2a85d043b35d82087b85f8bfb75ae578f3d9ac3
      https://github.com/lxc/lxc/commit/c2a85d043b35d82087b85f8bfb75ae578f3d9ac3
  Author: Antonio Terceiro <terceiro at debian.org>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: allow not including contrib/non-free

Signed-off-by: Antonio Terceiro <terceiro at debian.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 2d8632d5b75ce1e4b24f5714b9ec817a845881cf
      https://github.com/lxc/lxc/commit/2d8632d5b75ce1e4b24f5714b9ec817a845881cf
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-08-27 (Thu, 27 Aug 2015)

  Changed paths:
    M doc/ja/lxc.system.conf.sgml.in
    M doc/lxc.system.conf.sgml.in

  Log Message:
  -----------
  doc: Update lxc.cgroup.use in lxc.system.conf(5)

LXC now uses lxc.cgroup.use even when cgmanager is used.
So remove the description for the case of using cgmanager.
And add the case of not specifying it.
This commit only updates en and ja man pages.

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/5b4543292d76...2d8632d5b75c


More information about the lxc-devel mailing list