[asterisk-commits] tilghman: branch 1.6.1 r212862 - in /branches/1.6.1: ./ configs/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Aug 18 14:27:06 2009
New Revision: 212862

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=212862
Log:
Merged revisions 212857 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r212857 | tilghman | 2009-08-18 14:25:09 -0500 (Tue, 18 Aug 2009) | 4 lines
  
  Make the default extconfig.conf match entries with the sample res_mysql.conf.
  This eliminates a future source of possible confusion with the configuration of
  1.6.1 and higher.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/extconfig.conf.sample

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

Modified: branches/1.6.1/configs/extconfig.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/configs/extconfig.conf.sample?view=diff&rev=212862&r1=212861&r2=212862
==============================================================================
--- branches/1.6.1/configs/extconfig.conf.sample (original)
+++ branches/1.6.1/configs/extconfig.conf.sample Tue Aug 18 14:27:06 2009
@@ -56,9 +56,9 @@
 ;sipregs => odbc,asterisk
 ;voicemail => odbc,asterisk
 ;extensions => odbc,asterisk
-;meetme => mysql,conferences
+;meetme => mysql,general
 ;queues => odbc,asterisk
 ;queue_members => odbc,asterisk
-;musiconhold => mysql,asterisk
-;queue_log => mysql,aasterisk
+;musiconhold => mysql,general
+;queue_log => mysql,general