]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #20787 from fbuihuu/watchdog-more-rework
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Oct 2021 10:56:44 +0000 (12:56 +0200)
committerGitHub <noreply@github.com>
Wed, 13 Oct 2021 10:56:44 +0000 (12:56 +0200)
Watchdog more rework

1  2 
man/systemd-system.conf.xml
src/core/load-fragment.c
src/core/load-fragment.h
src/core/main.c
src/core/manager.c

Simple merge
Simple merge
Simple merge
diff --cc src/core/main.c
Simple merge
Simple merge