Merge pull request #8981 from keszybz/ratelimit-and-dbus
authorLennart Poettering <lennart@poettering.net>
Fri, 18 May 2018 19:38:30 +0000 (21:38 +0200)
committerGitHub <noreply@github.com>
Fri, 18 May 2018 19:38:30 +0000 (21:38 +0200)
Ratelimit renaming and dbus error message fix

1  2 
src/basic/fs-util.c
src/core/dbus.c
src/core/device.c
src/core/manager.c
src/core/unit.c
src/tmpfiles/tmpfiles.c

Simple merge
diff --cc src/core/dbus.c
Simple merge
Simple merge
Simple merge
diff --cc src/core/unit.c
Simple merge
Simple merge