Blocked revisions 403291

........
remove unwanted property svn:mergeinfo


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@403401 f38db490-d61c-443f-a65b-d21fe96a405b
Multiple revisions 403304,403310

........
  r403304 | dlee | 2013-12-02 12:34:50 -0600 (Mon, 02 Dec 2013) | 1 line
  
  Fixed the filename for the ari.conf docs
........
  r403310 | file | 2013-12-03 10:32:12 -0600 (Tue, 03 Dec 2013) | 5 lines
  
  Revert revision 403304: Fixed the filename for the ari.conf docs
  
  The changed value refers to the name of the module. The name of the
  configuration file is specified in the configFile section.
........

Merged revisions 403304,403310 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@403402 f38db490-d61c-443f-a65b-d21fe96a405b
ari: Fix deadlock problem with functions that use autoservice.

The code for getting channel variables from ARI assumed that you needed
to lock the channel in order to properly execute functions and read
channel variables. Apparently, this is not the case, since any dialplan
function that puts the channel into autoservice deadlocks when
attempting to remove the channel from autoservice.
........

Merged revisions 403342 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@403403 f38db490-d61c-443f-a65b-d21fe96a405b