[asterisk-commits] seanbright: trunk r304195 - in /trunk: ./ configs/queues.conf.sample

Wed Jan 26 14:25:28 CST 2011

Author: seanbright
Date: Wed Jan 26 14:25:24 2011
New Revision: 304195

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304195
Log:
Merged revisions 304186 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304186 | seanbright | 2011-01-26 15:23:48 -0500 (Wed, 26 Jan 2011) | 16 lines
  
  Merged revisions 304181 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r304181 | seanbright | 2011-01-26 15:22:47 -0500 (Wed, 26 Jan 2011) | 9 lines
    
    Merged revisions 304159 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r304159 | seanbright | 2011-01-26 15:18:29 -0500 (Wed, 26 Jan 2011) | 1 line
      
      Make sure the sample queues.conf is properly commented.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/configs/queues.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/queues.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/queues.conf.sample?view=diff&rev=304195&r1=304194&r2=304195
==============================================================================

--- trunk/configs/queues.conf.sample (original)
+++ trunk/configs/queues.conf.sample Wed Jan 26 14:25:24 2011
@@ -88,7 +88,7 @@
 ; random - ring random interface
 ; rrmemory - round robin with memory, remember where we left off last ring pass
 ; rrordered - same as rrmemory, except the queue member order from config file 
-              is preserved
+;             is preserved
 ; linear - rings interfaces in the order specified in this configuration file.
 ;          If you use dynamic members, the members will be rung in the order in
 ;          which they were added


