Merged revisions 305343 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Tue, 1 Feb 2011 00:07:30 +0000 (00:07 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 1 Feb 2011 00:07:30 +0000 (00:07 +0000)
commit44349de2dfaa12b2c6045acd49b40d8abb2fc777
tree8ef5a5d5820cf1c28394be641b7578b5a6ecb96f
parent6908539952b758b9e555c2f76beffdc36675734a
Merged revisions 305343 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r305343 | rmudgett | 2011-01-31 18:01:09 -0600 (Mon, 31 Jan 2011) | 21 lines

  Merged revisions 305342 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r305342 | rmudgett | 2011-01-31 17:50:10 -0600 (Mon, 31 Jan 2011) | 14 lines

    Merged revisions 305341 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r305341 | rmudgett | 2011-01-31 17:45:58 -0600 (Mon, 31 Jan 2011) | 7 lines

      Obtain the pri lock for PRI queue counters.

      Need to obtain the pri lock when calling pri_dump_info_str() to avoid a
      reentrancy problem when calculating the Q.921 Q count statistic.

      JIRA AST-484
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/sig_pri.c