From: David M. Lee Date: Mon, 9 Sep 2013 19:09:21 +0000 (+0000) Subject: Multiple revisions 398638-398639 X-Git-Tag: 13.0.0-beta1~1112 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bcc676d09bbf11e02368ababe280795de61746d;p=thirdparty%2Fasterisk.git 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398641 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h index 953d58f4eb..e4dcc1b7d4 100644 --- a/res/ari/resource_channels.h +++ b/res/ari/resource_channels.h @@ -72,6 +72,8 @@ struct ast_originate_args { /*! * \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 diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json index 0f3b8e20e6..b408d8b173 100644 --- a/rest-api/api-docs/channels.json +++ b/rest-api/api-docs/channels.json @@ -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": [