]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge changes from topic 'ASTERISK-27625' into 15
authorGeorge Joseph <gjoseph@digium.com>
Thu, 21 Jun 2018 15:23:37 +0000 (10:23 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 21 Jun 2018 15:23:37 +0000 (10:23 -0500)
* changes:
  channel.c: Fix usage of CHECK_BLOCKING()
  autoservice: Don't start channel autoservice if the thread is a user interface.

1  2 
include/asterisk/utils.h
main/channel.c

Simple merge
diff --cc main/channel.c
Simple merge