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.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 2b1ac090d301bd3b18e21e95ebb6bc69f8e1249b..ae368f10792d1aafa21c4ea9c9cddfc08177ceaf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,23 @@
 --- 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.
+
+ * The version of AMI has been bumped to 2.6.0 to account for the backwards
+   compatible feature listed above.
+
+ARI
+------------------
+ * Event ChannelConnectedLine is emitted when the connected line information
+   on a channel changes.
+
+ * The version of ARI has been bumped to 1.6.0 to account for the backwards
+   compatible feature listed above.
+
+Core Transfers
 -----------------
 
 The features.conf general section has three new configurable options:
@@ -387,17 +403,6 @@ res_pjsip_publish_asterisk
    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 ------------
 ------------------------------------------------------------------------------

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 9720bf0d0c46748eb3d11e2b0273444248d9a10e..0c500da225931b894093ab1a1c1675944e5a25ab 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -23,6 +23,16 @@
 
 From 13.0.0 to 13.1.0:
 
+ARI:
+ - The version of ARI has been bumped to 1.6.0 to account for backwards
+   compatible features included with this release. See CHANGES for more
+   information.
+
+AMI:
+ - The version of AMI has been bumped to 2.6.0 to account for backwards
+   compatible features included with this release. See CHANGES for more
+   information.
+
 Core:
  - The core of Asterisk uses a message bus called "Stasis" to distribute
    information to internal components. For performance reasons, the message

diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 607f435415c5bdc11606d9a255f8ac835f8c71a6..387430fdeff073bbce976027d60fbc7a25b9c5fd 100644 (file)
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -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 */
 

diff --git a/rest-api/api-docs/applications.json b/rest-api/api-docs/applications.json
index 9ac1c2383ce2f9bb1d982b2e6b6f6434253ca976..f6fe72ac5a6f20f9ae1cff9a1d59052e187015e4 100644 (file)
--- a/rest-api/api-docs/applications.json
+++ b/rest-api/api-docs/applications.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/applications.{format}",

diff --git a/rest-api/api-docs/asterisk.json b/rest-api/api-docs/asterisk.json
index 34e3894a2eccfda48fa3cedf428f8e4c280b203c..f13b0493ec790dc9666a2785298506697854a517 100644 (file)
--- a/rest-api/api-docs/asterisk.json
+++ b/rest-api/api-docs/asterisk.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/asterisk.{format}",

diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json
index de720672051d9bb4c1642e188cb3e64bb1fc47c7..21708c8392a6618be85124f171e659025694d414 100644 (file)
--- a/rest-api/api-docs/bridges.json
+++ b/rest-api/api-docs/bridges.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/bridges.{format}",

diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json
index d88434b3ebe914200b13abe523521d0124a12b6f..67634740ae0445ae9a0d4335c053be04732560cb 100644 (file)
--- a/rest-api/api-docs/channels.json
+++ b/rest-api/api-docs/channels.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/channels.{format}",

diff --git a/rest-api/api-docs/deviceStates.json b/rest-api/api-docs/deviceStates.json
index c14b55deaecddb3bb8b6228d0cd12e90e802cd56..02d5d208db1b77282417b76cda2b8034ce0c8ddd 100644 (file)
--- a/rest-api/api-docs/deviceStates.json
+++ b/rest-api/api-docs/deviceStates.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "Kevin Harwell <kharwell@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/deviceStates.{format}",

diff --git a/rest-api/api-docs/endpoints.json b/rest-api/api-docs/endpoints.json
index f30ce9a0061055c14c547727eb68c33f5722822e..e7b4ba73a19935e3e71954967dc0bb097c52428a 100644 (file)
--- a/rest-api/api-docs/endpoints.json
+++ b/rest-api/api-docs/endpoints.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/endpoints.{format}",

diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json
index eac1e3f423f89a5d0d250e7c9c0e211918fe9674..1aceb71edf53a277cd092cb4102a6b70f49b0e8d 100644 (file)
--- a/rest-api/api-docs/events.json
+++ b/rest-api/api-docs/events.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.2",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/events.{format}",

diff --git a/rest-api/api-docs/mailboxes.json b/rest-api/api-docs/mailboxes.json
index 0deb5fb412ed9bc1b89cb98b8b825900d7701507..87c6f034752ebd8b4126c264ebf237298f2795df 100644 (file)
--- a/rest-api/api-docs/mailboxes.json
+++ b/rest-api/api-docs/mailboxes.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2013, Digium, Inc.",
        "_author": "Jonathan Rose <jrose@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/mailboxes.{format}",

diff --git a/rest-api/api-docs/playbacks.json b/rest-api/api-docs/playbacks.json
index f892fb3d25ee8fa0741a7007edd737931dd32869..65ef524574ab747670d153ec3e0f39ca3f32c832 100644 (file)
--- a/rest-api/api-docs/playbacks.json
+++ b/rest-api/api-docs/playbacks.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/playbacks.{format}",

diff --git a/rest-api/api-docs/recordings.json b/rest-api/api-docs/recordings.json
index 89c55d59e48ce769cb1a95d6086745b520427c64..d96184bd014bb278c86f09c42331d79d052ffa94 100644 (file)
--- a/rest-api/api-docs/recordings.json
+++ b/rest-api/api-docs/recordings.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/recordings.{format}",

diff --git a/rest-api/api-docs/sounds.json b/rest-api/api-docs/sounds.json
index dd0b717556cce4b3866f9a3e9e307014ac67ff67..906eb6bf1311bff92a4bf7a81ac5346ece5bd5f2 100644 (file)
--- a/rest-api/api-docs/sounds.json
+++ b/rest-api/api-docs/sounds.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "resourcePath": "/api-docs/sounds.{format}",

diff --git a/rest-api/resources.json b/rest-api/resources.json
index 921f360ef711354e3ccfdf792219191d5179b9f9..2cc039dc3a2ede152ff78b2867bff3750b4b1cb6 100644 (file)
--- a/rest-api/resources.json
+++ b/rest-api/resources.json
@@ -2,7 +2,7 @@
        "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
        "_author": "David M. Lee, II <dlee@digium.com>",
        "_svn_revision": "$Revision$",
-       "apiVersion": "1.5.0",
+       "apiVersion": "1.6.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "apis": [