[asterisk-commits] dlee: trunk r398641 - in /trunk: ./ res/ari/ rest-api/api-docs/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Sep  9 14:09:21 2013
New Revision: 398641

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398641
Log:
Multiple revisions 398638-398639

........
  r398638 | dlee | 2013-09-09 14:01:54 -0500 (Mon, 09 Sep 2013) | 1 line
  
  Added note about expected behavior of originate
........
  r398639 | dlee | 2013-09-09 14:02:27 -0500 (Mon, 09 Sep 2013) | 1 line
  
  Added note about expected behavior of originate (the rest of the commit)
........

Merged revisions 398638-398639 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/ari/resource_channels.h
    trunk/rest-api/api-docs/channels.json

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Sep  9 14:09:21 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398198,398206,398215,398226,398237,398283,398286,398299,398303,398368,398381,398418,398458,398498,398511,398521,398533,398562,398572,398579-398580,398619,398628
+/branches/12:1-398558,398560-398577,398579-398639

Modified: trunk/res/ari/resource_channels.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari/resource_channels.h?view=diff&rev=398641&r1=398640&r2=398641
==============================================================================
--- trunk/res/ari/resource_channels.h (original)
+++ trunk/res/ari/resource_channels.h Mon Sep  9 14:09:21 2013
@@ -72,6 +72,8 @@
 /*!
  * \brief Create a new channel (originate).
  *
+ * The new channel is not created until the dialed party picks up. Not wanting to block this request indefinitely, this request returns immediately with a 204 No Content. When the channel is created, a StasisStart event is sent with the provided app and appArgs. In the event of a failure (timeout, busy, etc.), an OriginationFailed event is sent.
+ *
  * \param headers HTTP headers
  * \param args Swagger parameters
  * \param[out] response HTTP response

Modified: trunk/rest-api/api-docs/channels.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/channels.json?view=diff&rev=398641&r1=398640&r2=398641
==============================================================================
--- trunk/rest-api/api-docs/channels.json (original)
+++ trunk/rest-api/api-docs/channels.json Mon Sep  9 14:09:21 2013
@@ -20,6 +20,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Create a new channel (originate).",
+					"notes": "The new channel is not created until the dialed party picks up. Not wanting to block this request indefinitely, this request returns immediately with a 204 No Content. When the channel is created, a StasisStart event is sent with the provided app and appArgs. In the event of a failure (timeout, busy, etc.), an OriginationFailed event is sent.",
 					"nickname": "originate",
 					"responseClass": "void",
 					"parameters": [