Merge pull request #20690 from DaanDeMeyer/oomd-user-services

author Luca Boccassi <luca.boccassi@microsoft.com>

Tue, 21 Sep 2021 14:39:48 +0000 (15:39 +0100)

committer GitHub <noreply@github.com>

Tue, 21 Sep 2021 14:39:48 +0000 (15:39 +0100)
author Luca Boccassi <luca.boccassi@microsoft.com>
Tue, 21 Sep 2021 14:39:48 +0000 (15:39 +0100)
committer GitHub <noreply@github.com>
Tue, 21 Sep 2021 14:39:48 +0000 (15:39 +0100)
diff --cc src/core/manager.c
Simple merge
diff --cc src/core/manager.h
Simple merge
diff --cc src/oom/oomd-manager.c
Simple merge
diff --cc src/oom/oomd.c
Simple merge
diff --cc test/test-functions
Simple merge
diff --cc units/meson.build
Simple merge
author	Luca Boccassi <luca.boccassi@microsoft.com>
	Tue, 21 Sep 2021 14:39:48 +0000 (15:39 +0100)
committer	GitHub <noreply@github.com>
	Tue, 21 Sep 2021 14:39:48 +0000 (15:39 +0100)
		1	2
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/oom/oomd-manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/oom/oomd.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-functions	patch \|	diff1 \|	diff2 \|	blob \| history
units/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history