diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-15 16:15:45 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-15 16:15:45 +0100 |
| commit | 648461c07dbe722b1298686a3b35d339a5fa5ab0 (patch) | |
| tree | fc833ff5177e278ca15616c82ea2e88da2d42c7f /units/systemd-machined.service.in | |
| parent | f45b8015513d38ee5f7cc361db9c5b88c9aae704 (diff) | |
| parent | 1e78432157d14c967e2fd65a7822179cfebdfc62 (diff) | |
| download | systemd-648461c07dbe722b1298686a3b35d339a5fa5ab0.tar.gz | |
Merge pull request #8125 from poettering/cgroups-migrate
Trivial merge conflict resolved locally.
Diffstat (limited to 'units/systemd-machined.service.in')
0 files changed, 0 insertions, 0 deletions