Merged revisions 378429 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 3 Jan 2013 18:20:07 +0000 (18:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 3 Jan 2013 18:20:07 +0000 (18:20 +0000)
commit06b4ef83179ddc1160330df5bfb19c476d8f399a
tree31d0a92a8d5ca09c41fe52e3d4643fa1b18181fa
parent01250e2585afc0feac2ed41eddc9646c875adb96
Merged revisions 378429 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r378429 | rmudgett | 2013-01-03 11:48:14 -0600 (Thu, 03 Jan 2013) | 10 lines

  chan_agent: Fix agent_indicate() locking.

  Avoid deadlock potential with local channels and simplify the locking.
  ........

  Merged revisions 378427 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 378428 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_agent.c