Merge pull request #27244 from bluca/uphold_retry

author Luca Boccassi <bluca@debian.org>

Thu, 13 Apr 2023 20:33:06 +0000 (21:33 +0100)

committer GitHub <noreply@github.com>

Thu, 13 Apr 2023 20:33:06 +0000 (21:33 +0100)
author Luca Boccassi <bluca@debian.org>
Thu, 13 Apr 2023 20:33:06 +0000 (21:33 +0100)
committer GitHub <noreply@github.com>
Thu, 13 Apr 2023 20:33:06 +0000 (21:33 +0100)
diff --cc src/core/manager.c
Simple merge
diff --cc src/core/unit.c
Simple merge
diff --cc src/core/unit.h
Simple merge
author	Luca Boccassi <bluca@debian.org>
	Thu, 13 Apr 2023 20:33:06 +0000 (21:33 +0100)
committer	GitHub <noreply@github.com>
	Thu, 13 Apr 2023 20:33:06 +0000 (21:33 +0100)
		1	2
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.h	patch \|	diff1 \|	diff2 \|	blob \| history