Merge pull request #13904 from keur/job_mode_triggering

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Thu, 7 Nov 2019 07:36:26 +0000 (08:36 +0100)

committer GitHub <noreply@github.com>

Thu, 7 Nov 2019 07:36:26 +0000 (08:36 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 7 Nov 2019 07:36:26 +0000 (08:36 +0100)
committer GitHub <noreply@github.com>
Thu, 7 Nov 2019 07:36:26 +0000 (08:36 +0100)
diff --cc TODO
Simple merge
diff --cc src/core/job.c
Simple merge
diff --cc src/core/manager.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 7 Nov 2019 07:36:26 +0000 (08:36 +0100)
committer	GitHub <noreply@github.com>
	Thu, 7 Nov 2019 07:36:26 +0000 (08:36 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/job.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history