[svn-commits] mmichelson: trunk r207723 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Jul 21 09:29:40 2009
New Revision: 207723

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

........
  r207714 | mmichelson | 2009-07-21 09:26:00 -0500 (Tue, 21 Jul 2009) | 5 lines
  
  Document default timeout for AMI originations.
  
  AST-224
........

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/manager.c?view=diff&rev=207723&r1=207722&r2=207723
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Jul 21 09:29:40 2009
@@ -415,8 +415,8 @@
 			<parameter name="Data">
 				<para>Data to use (requires <literal>Application</literal>).</para>
 			</parameter>
-			<parameter name="Timeout">
-				<para>How long to wait for call to be answered (in ms).</para>
+			<parameter name="Timeout" default="30000">
+				<para>How long to wait for call to be answered (in ms.).</para>
 			</parameter>
 			<parameter name="CallerID">
 				<para>Caller ID to be set on the outgoing channel.</para>