Merge pull request #29630 from DaanDeMeyer/manager-json

author Daan De Meyer <daan.j.demeyer@gmail.com>

Fri, 20 Oct 2023 14:42:12 +0000 (16:42 +0200)

committer GitHub <noreply@github.com>

Fri, 20 Oct 2023 14:42:12 +0000 (16:42 +0200)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Fri, 20 Oct 2023 14:42:12 +0000 (16:42 +0200)
committer GitHub <noreply@github.com>
Fri, 20 Oct 2023 14:42:12 +0000 (16:42 +0200)
diff --cc src/core/dbus-execute.c
Simple merge
diff --cc src/core/execute.c
Simple merge
diff --cc src/core/unit.c
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Fri, 20 Oct 2023 14:42:12 +0000 (16:42 +0200)
committer	GitHub <noreply@github.com>
	Fri, 20 Oct 2023 14:42:12 +0000 (16:42 +0200)
		1	2
src/core/dbus-execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history