]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #9158 from poettering/notify-auto-reload
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 5 Jun 2018 11:51:07 +0000 (13:51 +0200)
committerGitHub <noreply@github.com>
Tue, 5 Jun 2018 11:51:07 +0000 (13:51 +0200)
trigger OnFailure= only if Restart= is not in effect

1  2 
src/core/automount.c
src/core/mount.c
src/core/path.c
src/core/service.c
src/core/socket.c
src/core/swap.c
src/core/unit.c

Simple merge
Simple merge
diff --cc src/core/path.c
Simple merge
Simple merge
Simple merge
diff --cc src/core/swap.c
Simple merge
diff --cc src/core/unit.c
Simple merge