]> git.ipfire.org Git - thirdparty/systemd.git/commit
Merge pull request #8125 from poettering/cgroups-migrate
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 15 Feb 2018 15:15:45 +0000 (16:15 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 15 Feb 2018 15:15:45 +0000 (16:15 +0100)
commit648461c07dbe722b1298686a3b35d339a5fa5ab0
treefc833ff5177e278ca15616c82ea2e88da2d42c7f
parentf45b8015513d38ee5f7cc361db9c5b88c9aae704
parent1e78432157d14c967e2fd65a7822179cfebdfc62
Merge pull request #8125 from poettering/cgroups-migrate

Trivial merge conflict resolved locally.
src/basic/missing.h
src/core/manager.c
src/core/mount.c
src/core/swap.c
src/core/unit.c