[asterisk-commits] kmoore: trunk r401088 - in /trunk: ./ res/ari/ rest-api/api-docs/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Oct 16 09:02:06 2013
New Revision: 401088

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401088
Log:
Clarify documentation for channel and bridge list

This makes it clear that the ARI API calls for listing channels and
bridges will list all channels or bridges in the system and not just
those that are in or are controlled by a Stasis application.

(closes issue ASTERISK-22635)
Reported by: Kevin Harwell
........

Merged revisions 401087 from http://svn.asterisk.org/svn/asterisk/branches/12

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

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

Modified: trunk/res/ari/resource_bridges.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari/resource_bridges.h?view=diff&rev=401088&r1=401087&r2=401088
==============================================================================
--- trunk/res/ari/resource_bridges.h (original)
+++ trunk/res/ari/resource_bridges.h Wed Oct 16 09:02:06 2013
@@ -43,7 +43,7 @@
 struct ast_get_bridges_args {
 };
 /*!
- * \brief List active bridges.
+ * \brief List all active bridges in Asterisk.
  *
  * \param headers HTTP headers
  * \param args Swagger parameters

Modified: trunk/res/ari/resource_channels.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari/resource_channels.h?view=diff&rev=401088&r1=401087&r2=401088
==============================================================================
--- trunk/res/ari/resource_channels.h (original)
+++ trunk/res/ari/resource_channels.h Wed Oct 16 09:02:06 2013
@@ -43,7 +43,7 @@
 struct ast_get_channels_args {
 };
 /*!
- * \brief List active channels.
+ * \brief List all active channels in Asterisk.
  *
  * \param headers HTTP headers
  * \param args Swagger parameters

Modified: trunk/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/bridges.json?view=diff&rev=401088&r1=401087&r2=401088
==============================================================================
--- trunk/rest-api/api-docs/bridges.json (original)
+++ trunk/rest-api/api-docs/bridges.json Wed Oct 16 09:02:06 2013
@@ -13,7 +13,7 @@
 			"operations": [
 				{
 					"httpMethod": "GET",
-					"summary": "List active bridges.",
+					"summary": "List all active bridges in Asterisk.",
 					"nickname": "getBridges",
 					"responseClass": "List[Bridge]"
 				},

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=401088&r1=401087&r2=401088
==============================================================================
--- trunk/rest-api/api-docs/channels.json (original)
+++ trunk/rest-api/api-docs/channels.json Wed Oct 16 09:02:06 2013
@@ -13,7 +13,7 @@
 			"operations": [
 				{
 					"httpMethod": "GET",
-					"summary": "List active channels.",
+					"summary": "List all active channels in Asterisk.",
 					"nickname": "getChannels",
 					"responseClass": "List[Channel]"
 				},