Merge "res_pjsip: Fix deadlock on reliable transport shutdown." into 13

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Wed, 18 Apr 2018 22:20:19 +0000 (17:20 -0500)

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

Wed, 18 Apr 2018 22:20:19 +0000 (17:20 -0500)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 18 Apr 2018 22:20:19 +0000 (17:20 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 18 Apr 2018 22:20:19 +0000 (17:20 -0500)
diff --cc res/res_pjsip_outbound_registration.c
Simple merge
diff --cc res/res_pjsip_pubsub.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Wed, 18 Apr 2018 22:20:19 +0000 (17:20 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 18 Apr 2018 22:20:19 +0000 (17:20 -0500)
		1	2
res/res_pjsip_outbound_registration.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip_pubsub.c	patch \|	diff1 \|	diff2 \|	blob \| history