kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

configs: Clean up long line and typo in res_odbc.conf.sample.

Browse Source 
........

Merged revisions 411807 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@411808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Walter Doekes
2014-04-07 14:48:07 +00:00
parent 45ebd29e10
commit 188d8f2bc7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UPGRADE.txt
View File

@@ -50,7 +50,7 @@ from 11.8 to 11.9
Disable it for PostgreSQL backends in order to avoid errors caused by Disable it for PostgreSQL backends in order to avoid errors caused by
updating integer columns with an empty string instead of NULL updating integer columns with an empty string instead of NULL
(sipppeers,sipregs) (sippeers, sipregs, ..).
From 11.7 to 11.8: From 11.7 to 11.8:
- The per console verbose level feature as previously implemented caused a - The per console verbose level feature as previously implemented caused a

8
configs/res_odbc.conf.sample
View File

@@ -23,7 +23,8 @@ enabled => no
; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems). ; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
dsn => asterisk dsn => asterisk
; ;
; Username for connecting to the database. The user defaults to the context name if unspecified. ; Username for connecting to the database. The user defaults to the context
; name if unspecified.
;username => myuser ;username => myuser
; ;
; Password for authenticating the user to the database. The default ; Password for authenticating the user to the database. The default
@@ -68,8 +69,9 @@ pre-connect => yes
; during realtime updates. Disabling this option causes empty column values to be ; during realtime updates. Disabling this option causes empty column values to be
; stored as NULLs for non-text columns. ; stored as NULLs for non-text columns.
; Disable it for PostgreSQL backend in order to avoid errors caused by updating ; Disable it for PostgreSQL backend in order to avoid errors caused by updating
; integer columns with an empty string instead of NULL (sipppeers,sipregs) ; integer columns with an empty string instead of NULL (sippeers, sipregs, ..).
; NOTE: This option will be removed in asterisk 13. At that point, it will always behave as if it was set to 'no'. ; NOTE: This option will be removed in asterisk 13. At that point, it will always
; behave as if it was set to 'no'.
;allow_empty_string_in_nontext => yes ;allow_empty_string_in_nontext => yes
; ;
; How long (in seconds) should we attempt to connect before considering the ; How long (in seconds) should we attempt to connect before considering the