Merged revisions 378688,378691 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r378688 | rmudgett | 2013-01-08 17:44:26 -0600 (Tue, 08 Jan 2013) | 35 lines
  
  app_queue: Fix multiple calls to a queue member that is in only one queue.
  
  When ringinuse=no queue members can receive more than one call if these
  calls happen at nearly the same time.
  
  * Fix so a queue member does not receive more than one call from a queue.
  
  NOTE: This fix does not prevent multiple calls to a member if the member
  is in more than one queue.
  
  * Did some refactoring to eliminate some code redundancy.
  
  (issue ASTERISK-16115)
  Reported by: nik600
  Patches:
        jira_asterisk_16115_single_q_v1.8.patch (license #5621) patch uploaded by rmudgett
        Modified
  
  * Revert the -r341580 and -r341599 changes adding the queues.conf
  check_state_unknown option as it was added in an attempt to fix this
  problem.  The fix did not need to be optional.  The fix should not have
  tried to explicitly set the device state.  Setting the device state by
  something other than the device introduces a race condition.  I also could
  not see how the change would be effective other than delaying the
  app_queue code long enough for the device state to propagate to app_queue.
  ........
  
  Merged revisions 378663 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 378683 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 378687 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r378691 | rmudgett | 2013-01-08 18:05:35 -0600 (Tue, 08 Jan 2013) | 10 lines
  
  app_queue: Fix incorrect assertion.
  
  (issue ASTERISK-16115)
  ........
  
  Merged revisions 378689 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 378690 from http://svn.asterisk.org/svn/asterisk/branches/11
................


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

1 files changed, 0 insertions, 7 deletions

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index c9e5e21a4..f7c05181c 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -71,13 +71,6 @@ monitor-type = MixMonitor
 ;
 ;log_membername_as_agent = no
 ;
-; app_queue allows calls to members in a "Unknown" state to be treated as available
-; setting check_state_unknown = yes will cause app_queue to query the channel driver
-; to better determine the state this only applies to queues with ringinuse set
-; appropriately.
-;
-;check_state_unknown = no
-;
 ;[markq]
 ;
 ; A sample call queue