[svn-commits] russell: branch 1.6.0 r119535 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: russell
Date: Sun Jun  1 20:08:56 2008
New Revision: 119535

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

................
r119534 | russell | 2008-06-01 20:08:16 -0500 (Sun, 01 Jun 2008) | 10 lines

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

........
r119533 | russell | 2008-06-01 20:06:09 -0500 (Sun, 01 Jun 2008) | 2 lines

Change a debug message to an actual debug message

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

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

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=119535&r1=119534&r2=119535
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Sun Jun  1 20:08:56 2008
@@ -2214,7 +2214,7 @@
 
 	if (owner) {
 		if (ast_channel_trylock(owner)) {
-			ast_log(LOG_NOTICE, "Avoiding IAX destroy deadlock\n");
+			ast_debug(3, "Avoiding IAX destroy deadlock\n");
 			ast_mutex_unlock(&iaxsl[callno]);
 			usleep(1);
 			ast_mutex_lock(&iaxsl[callno]);