From fe6cbf455a181664845e446a1ddaead031f7a999 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Mon, 8 Dec 2014 16:54:43 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429092 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- CHANGES | 23 +++++++++++------------ include/asterisk/manager.h | 2 +- rest-api/api-docs/applications.json | 2 +- rest-api/api-docs/asterisk.json | 2 +- rest-api/api-docs/bridges.json | 2 +- rest-api/api-docs/channels.json | 2 +- rest-api/api-docs/deviceStates.json | 2 +- rest-api/api-docs/endpoints.json | 2 +- rest-api/api-docs/events.json | 2 +- rest-api/api-docs/mailboxes.json | 2 +- rest-api/api-docs/playbacks.json | 2 +- rest-api/api-docs/recordings.json | 2 +- rest-api/api-docs/sounds.json | 2 +- rest-api/resources.json | 2 +- 14 files changed, 24 insertions(+), 25 deletions(-) diff --git a/CHANGES b/CHANGES index cc6abddd54..a883f51565 100644 --- a/CHANGES +++ b/CHANGES @@ -79,7 +79,17 @@ res_musiconhold --- 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: @@ -455,17 +465,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/include/asterisk/manager.h b/include/asterisk/manager.h index 607f435415..387430fdef 100644 --- 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 9ac1c2383c..f6fe72ac5a 100644 --- 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 ", "_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 34e3894a2e..f13b0493ec 100644 --- 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 ", "_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 de72067205..21708c8392 100644 --- 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 ", "_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 d88434b3eb..67634740ae 100644 --- 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 ", "_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 c14b55deae..02d5d208db 100644 --- 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 ", "_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 f30ce9a006..e7b4ba73a1 100644 --- 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 ", "_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 eac1e3f423..1aceb71edf 100644 --- 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 ", "_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 0deb5fb412..87c6f03475 100644 --- 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 ", "_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 f892fb3d25..65ef524574 100644 --- 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 ", "_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 89c55d59e4..d96184bd01 100644 --- 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 ", "_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 dd0b717556..906eb6bf13 100644 --- 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 ", "_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 921f360ef7..2cc039dc3a 100644 --- 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 ", "_svn_revision": "$Revision$", - "apiVersion": "1.5.0", + "apiVersion": "1.6.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/ari", "apis": [