Merge "Prevent unload of modules which implement an Optional API."

author Joshua Colp <jcolp@digium.com>

Mon, 6 Nov 2017 16:11:51 +0000 (10:11 -0600)

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

Mon, 6 Nov 2017 16:11:51 +0000 (10:11 -0600)
author Joshua Colp <jcolp@digium.com>
Mon, 6 Nov 2017 16:11:51 +0000 (10:11 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 6 Nov 2017 16:11:51 +0000 (10:11 -0600)
diff --cc res/res_agi.c
Simple merge
diff --cc res/res_monitor.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 6 Nov 2017 16:11:51 +0000 (10:11 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 6 Nov 2017 16:11:51 +0000 (10:11 -0600)
		1	2
res/res_agi.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_monitor.c	patch \|	diff1 \|	diff2 \|	blob \| history