Merged revisions 295670 via svnmerge from
authorBrett Bryant <bbryant@digium.com>
Fri, 19 Nov 2010 21:42:10 +0000 (21:42 +0000)
committerBrett Bryant <bbryant@digium.com>
Fri, 19 Nov 2010 21:42:10 +0000 (21:42 +0000)
commitb54348691aa9f7912a4e1555cd41ac8cd2bd3d4b
tree0674adb84ef963ffe2fcf44f3b6daf2a43e67571
parent79c18d7105060259b56b0f774818d240144e2f3b
Merged revisions 295670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295670 | bbryant | 2010-11-19 16:40:21 -0500 (Fri, 19 Nov 2010) | 8 lines

  Patch for deadlock from ordering issue between channel/queue locks in app_queue
  (set_queue_variables).

  (closes issue #18031)
  Reported by: rain

  Review: https://reviewboard.asterisk.org/r/1018/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_queue.c