[svn-commits] lmadsen: trunk r324179 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Fri Jun 17 13:52:33 2011
New Revision: 324179

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324179
Log:
Merged revisions 324178 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324178 | lmadsen | 2011-06-17 14:51:16 -0400 (Fri, 17 Jun 2011) | 2 lines
  
  Add Username and Secret fields to manager Login action.
  Pointed out by Vlad Povorozniuc
........

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

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=324179&r1=324178&r2=324179
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri Jun 17 13:52:33 2011
@@ -133,6 +133,12 @@
 		<syntax>
 			<parameter name="ActionID">
 				<para>ActionID for this transaction. Will be returned.</para>
+			</parameter>
+			<parameter name="Username" required="true">
+				<para>Username to login with as specified in manager.conf.</para>
+			</parameter>
+			<parameter name="Secret">
+				<para>Secret to login with as specified in manager.conf.</para>
 			</parameter>
 		</syntax>
 		<description>