[prev in list] [next in list] [prev in thread] [next in thread]
List: asterisk-commits
Subject: [asterisk-commits] russell: branch 1.6.1 r255412 - in
From: SVN commits to the Asterisk project <asterisk-commits () lists ! digium ! com>
Date: 2010-03-30 21:57:52
Message-ID: E1NwjRY-0005N3-C6 () wibble ! digium ! internal
[Download RAW message or body]
Author: russell
Date: Tue Mar 30 15:57:48 2010
New Revision: 255412
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255412
Log:
Merged revisions 255410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r255410 | russell | 2010-03-30 15:56:26 -0500 (Tue, 30 Mar 2010) | 9 lines
Merged revisions 255409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r255409 | russell | 2010-03-30 15:56:00 -0500 (Tue, 30 Mar 2010) | 2 lines
Don't kill Asterisk if the H323 listener does not start.
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/channels/chan_h323.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_h323.c?view=diff&rev=255412&r1=255411&r2=255412
==============================================================================
--- branches/1.6.1/channels/chan_h323.c (original)
+++ branches/1.6.1/channels/chan_h323.c Tue Mar 30 15:57:48 2010
@@ -3301,7 +3301,7 @@
ASTOBJ_CONTAINER_DESTROYALL(&aliasl, oh323_destroy_alias);
ASTOBJ_CONTAINER_DESTROY(&aliasl);
- return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_DECLINE;
}
/* Possibly register with a GK */
if (!gatekeeper_disable) {
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
asterisk-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/asterisk-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic