[svn-commits] qwell: trunk r89116 - in /trunk: ./ configs/

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Nov  8 12:48:15 2007
New Revision: 89116

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89116
Log:
Merged revisions 89115 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11195)
........
r89115 | qwell | 2007-11-08 12:45:15 -0600 (Thu, 08 Nov 2007) | 4 lines

Avoid warnings on load when using sample configuration files.

Issue 11195, patch by eliel.

........

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

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

Modified: trunk/configs/cdr_adaptive_odbc.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/cdr_adaptive_odbc.conf.sample?view=diff&rev=89116&r1=89115&r2=89116
==============================================================================
--- trunk/configs/cdr_adaptive_odbc.conf.sample (original)
+++ trunk/configs/cdr_adaptive_odbc.conf.sample Thu Nov  8 12:48:15 2007
@@ -17,20 +17,20 @@
 ; table names, you will get duplicate records in that table.  So be careful.
 ;
 
-[first]
-connection=mysql1
-table=cdr
+;[first]
+;connection=mysql1
+;table=cdr
 
-[second]
-connection=mysql1
-table=extracdr
+;[second]
+;connection=mysql1
+;table=extracdr
 
-[third]
-connection=sqlserver
-table=AsteriskCDR
-alias src => source
-alias channel => source_channel
-alias dst => dest
-alias dstchannel => dest_channel
+;[third]
+;connection=sqlserver
+;table=AsteriskCDR
+;alias src => source
+;alias channel => source_channel
+;alias dst => dest
+;alias dstchannel => dest_channel
 
 

Modified: trunk/configs/res_odbc.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/res_odbc.conf.sample?view=diff&rev=89116&r1=89115&r2=89116
==============================================================================
--- trunk/configs/res_odbc.conf.sample (original)
+++ trunk/configs/res_odbc.conf.sample Thu Nov  8 12:48:15 2007
@@ -10,7 +10,7 @@
 ; All other sections are arbitrary names for database connections.
 
 [asterisk]
-enabled => yes
+enabled => no
 dsn => asterisk
 ;username => myuser
 ;password => mypass