Merge "pjsip_scheduler.c: Add ability to trace scheduled tasks." into 13

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Mon, 16 Apr 2018 12:00:21 +0000 (07:00 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Mon, 16 Apr 2018 12:00:21 +0000 (07:00 -0500)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 16 Apr 2018 12:00:21 +0000 (07:00 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 16 Apr 2018 12:00:21 +0000 (07:00 -0500)
diff --cc include/asterisk/res_pjsip.h
Simple merge
diff --cc res/res_pjsip/pjsip_scheduler.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Mon, 16 Apr 2018 12:00:21 +0000 (07:00 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 16 Apr 2018 12:00:21 +0000 (07:00 -0500)
		1	2
include/asterisk/res_pjsip.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip/pjsip_scheduler.c	patch \|	diff1 \|	diff2 \|	blob \| history