[asterisk-commits] tilghman: branch 1.6.1 r171966 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jan 28 11:29:26 2009
New Revision: 171966

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

................
  r171964 | tilghman | 2009-01-28 11:27:40 -0600 (Wed, 28 Jan 2009) | 9 lines
  
  Merged revisions 171963 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r171963 | tilghman | 2009-01-28 11:25:18 -0600 (Wed, 28 Jan 2009) | 2 lines
    
    Clarify log message (suggested by manxpower on #asterisk-dev)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

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

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=171966&r1=171965&r2=171966
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Wed Jan 28 11:29:26 2009
@@ -14582,7 +14582,7 @@
 				mwilevel = atoi(v->value);
 			}
 		} else if (!(options & PROC_DAHDI_OPT_NOWARN) )
-			ast_log(LOG_WARNING, "Ignoring %s at line %d.\n", v->name, v->lineno);
+			ast_log(LOG_WARNING, "Ignoring any changes to '%s' (on reload) at line %d.\n", v->name, v->lineno);
 	}
 	if (dahdichan[0]) { 
 		/* The user has set 'dahdichan' */