Author: mjordan
Date: Mon Dec  8 10:54:43 2014
New Revision: 429092

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429092
Log:
AMI/ARI: Update version to 2.6.0/1.6.0 respectively for new features

AMI/ARI are getting a few enhancements in the next release of Asterisk 13. Per
semantic versioning, that warrants a bump in the minor version number, as it
reflects a backwards compatible change. Hence, this commit.
........

Merged revisions 429091 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/include/asterisk/manager.h
    trunk/rest-api/api-docs/applications.json
    trunk/rest-api/api-docs/asterisk.json
    trunk/rest-api/api-docs/bridges.json
    trunk/rest-api/api-docs/channels.json
    trunk/rest-api/api-docs/deviceStates.json
    trunk/rest-api/api-docs/endpoints.json
    trunk/rest-api/api-docs/events.json
    trunk/rest-api/api-docs/mailboxes.json
    trunk/rest-api/api-docs/playbacks.json
    trunk/rest-api/api-docs/recordings.json
    trunk/rest-api/api-docs/sounds.json
    trunk/rest-api/resources.json

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

Modified: trunk/CHANGES
URL: 
http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Mon Dec  8 10:54:43 2014
@@ -79,7 +79,17 @@
 --- Functionality changes from Asterisk 13.0.0 to Asterisk 13.1.0 ------------
 ------------------------------------------------------------------------------
 
-Transfers
+AMI
+------------------
+ * Event NewConnectedLine is emitted when the connected line information on
+   a channel changes.
+
+ARI
+------------------
+ * Event ChannelConnectedLine is emitted when the connected line information
+   on a channel changes.
+
+Core Transfers
 -----------------
 
 The features.conf general section has three new configurable options:
@@ -454,17 +464,6 @@
    Asterisk information to other Asterisk servers. This module is intended only
    for Asterisk to Asterisk exchanges of information. Currently, this includes
    both mailbox state and device state information.
-
-
-AMI
-------------------
- * Event NewConnectedLine is emitted when the connected line information on
-   a channel changes.
-
-ARI
-------------------
- * Event ChannelConnectedLine is emitted when the connected line information
-   on a channel changes.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 12.4.0 to Asterisk 12.5.0 ------------

Modified: trunk/include/asterisk/manager.h
URL: 
http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Mon Dec  8 10:54:43 2014
@@ -54,7 +54,7 @@
 - \ref manager.c Main manager code file
  */
 
-#define AMI_VERSION                     "2.5.0"
+#define AMI_VERSION                     "2.6.0"
 #define DEFAULT_MANAGER_PORT 5038      /* Default port for Asterisk management 
via TCP */
 #define DEFAULT_MANAGER_TLS_PORT 5039  /* Default port for Asterisk management 
via TCP */
 

Modified: trunk/rest-api/api-docs/applications.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/applications.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/applications.json (original)
+++ trunk/rest-api/api-docs/applications.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/applications.{format}",

Modified: trunk/rest-api/api-docs/asterisk.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/asterisk.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/asterisk.json (original)
+++ trunk/rest-api/api-docs/asterisk.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/asterisk.{format}",

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=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/bridges.json (original)
+++ trunk/rest-api/api-docs/bridges.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/bridges.{format}",

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=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/channels.json (original)
+++ trunk/rest-api/api-docs/channels.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/channels.{format}",

Modified: trunk/rest-api/api-docs/deviceStates.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/deviceStates.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/deviceStates.json (original)
+++ trunk/rest-api/api-docs/deviceStates.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "Kevin Harwell <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/deviceStates.{format}",

Modified: trunk/rest-api/api-docs/endpoints.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/endpoints.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/endpoints.json (original)
+++ trunk/rest-api/api-docs/endpoints.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/endpoints.{format}",

Modified: trunk/rest-api/api-docs/events.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/events.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/events.json (original)
+++ trunk/rest-api/api-docs/events.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.2",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/events.{format}",

Modified: trunk/rest-api/api-docs/mailboxes.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/mailboxes.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/mailboxes.json (original)
+++ trunk/rest-api/api-docs/mailboxes.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2013, Digium, Inc.",
        "_author": "Jonathan Rose <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/mailboxes.{format}",

Modified: trunk/rest-api/api-docs/playbacks.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/playbacks.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/playbacks.json (original)
+++ trunk/rest-api/api-docs/playbacks.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/playbacks.{format}",

Modified: trunk/rest-api/api-docs/recordings.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/recordings.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/recordings.json (original)
+++ trunk/rest-api/api-docs/recordings.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/recordings.{format}",

Modified: trunk/rest-api/api-docs/sounds.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/sounds.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/api-docs/sounds.json (original)
+++ trunk/rest-api/api-docs/sounds.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "resourcePath": "/api-docs/sounds.{format}",

Modified: trunk/rest-api/resources.json
URL: 
http://svnview.digium.com/svn/asterisk/trunk/rest-api/resources.json?view=diff&rev=429092&r1=429091&r2=429092
==============================================================================
--- trunk/rest-api/resources.json (original)
+++ trunk/rest-api/resources.json Mon Dec  8 10:54:43 2014
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <[email protected]>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari";,
        "apis": [


-- 
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

svn-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/svn-commits

Reply via email to