[svn-commits] tilghman: branch 1.6.0 r118360 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue May 27 10:47:51 2008
New Revision: 118360

URL: http://svn.digium.com/view/asterisk?view=rev&rev=118360
Log:
Merged revisions 118359 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r118359 | tilghman | 2008-05-27 10:46:58 -0500 (Tue, 27 May 2008) | 11 lines

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

........
r118358 | tilghman | 2008-05-27 10:45:37 -0500 (Tue, 27 May 2008) | 3 lines

Add a note that pbx_config.so is needed for Local channels.
(Closes issue #12671)

........

................

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/queues.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/queues.conf.sample?view=diff&rev=118360&r1=118359&r2=118360
==============================================================================
--- branches/1.6.0/configs/queues.conf.sample (original)
+++ branches/1.6.0/configs/queues.conf.sample Tue May 27 10:47:51 2008
@@ -380,7 +380,10 @@
 ;
 ; It is important to ensure that channel drivers used for members are loaded
 ; before app_queue.so itself or they may be marked invalid until reload. This
-; can be accomplished by explicitly listing them in modules.conf before app_queue.so
+; can be accomplished by explicitly listing them in modules.conf before
+; app_queue.so.  Additionally, if you use Local channels as queue members, you
+; must also preload pbx_config.so (or pbx_ael.so, pbx_lua.so, or
+; pbx_realtime.so, depending on how your dialplan is configured).
 ;
 ;member => Zap/1
 ;member => Zap/2,10