Merge pull request #20833 from pdmorrow/onfailure_env

author Yu Watanabe <watanabe.yu+github@gmail.com>

Sat, 25 Dec 2021 06:29:42 +0000 (15:29 +0900)

committer GitHub <noreply@github.com>

Sat, 25 Dec 2021 06:29:42 +0000 (15:29 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Sat, 25 Dec 2021 06:29:42 +0000 (15:29 +0900)
committer GitHub <noreply@github.com>
Sat, 25 Dec 2021 06:29:42 +0000 (15:29 +0900)
diff --cc src/core/unit.c
Simple merge
diff --cc src/core/unit.h
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Sat, 25 Dec 2021 06:29:42 +0000 (15:29 +0900)
committer	GitHub <noreply@github.com>
	Sat, 25 Dec 2021 06:29:42 +0000 (15:29 +0900)
		1	2
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.h	patch \|	diff1 \|	diff2 \|	blob \| history