Merged revisions 376416 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Sun, 18 Nov 2012 15:20:26 +0000 (15:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Sun, 18 Nov 2012 15:20:26 +0000 (15:20 +0000)
commitdd85c232f04f2d8a53d84f9480a65fcadcb64ba5
treeb104297248842bf84ee18344fc5a210502ea8092
parent623d741ba1083dc5c28fc96a93f2920ca2d3ff1c
Merged revisions 376416 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r376416 | mjordan | 2012-11-18 08:31:32 -0600 (Sun, 18 Nov 2012) | 13 lines

  Add a test event that reports changes in ConfBridge state

  This patch adds a test event to ConfBridge that reports transitions between
  states in ConfBridge.  This is used by tests in the Asterisk Test Suite
  that verify state changes based on the entering/leaving of conference
  participants.
  ........

  Merged revisions 376414 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/confbridge/conf_state.c