From: George Joseph <gjoseph@digium.com>
Date: Thu, 21 Jun 2018 15:23:37 +0000 (-0500)
Subject: Merge changes from topic 'ASTERISK-27625' into 15
X-Git-Tag: 15.5.0-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=108f20a88a4b1242fae25afb0ba9e27f0da7b4d7;p=thirdparty%2Fasterisk.git

Merge changes from topic 'ASTERISK-27625' into 15

* changes:
  channel.c: Fix usage of CHECK_BLOCKING()
  autoservice: Don't start channel autoservice if the thread is a user interface.
---

108f20a88a4b1242fae25afb0ba9e27f0da7b4d7