From: Matthew Jordan Date: Tue, 8 Jul 2014 14:47:46 +0000 (+0000) Subject: manager/ARI: Update version to 2.4.0/1.4.0; Update UPGRADE.txt X-Git-Tag: 12.4.0-rc1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36719cba20b9b35fdb4efb765d9d8e65ee5e487a;p=thirdparty%2Fasterisk.git manager/ARI: Update version to 2.4.0/1.4.0; Update UPGRADE.txt git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@418182 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/UPGRADE.txt b/UPGRADE.txt index 42f9837d19..5d75670a08 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -35,6 +35,10 @@ From 12.3.2 to 12.4.0: - "Exited on signal $EXITSIGNAL" => "Asterisk exited on signal $EXITSIGNAL." - "Asterisk Died" => "Asterisk on $MACHINE died (sig $EXITSIGNAL)" +AMI: + - The AMI version has been changed from 2.3.0 to 2.4.0. This is to reflect + the backwards compatible changes listed in the CHANGES file. + ARI: - Added a compatibility option 'websocket_write_timeout'. When a websocket connection exists where Asterisk writes a substantial amount of data to @@ -43,6 +47,9 @@ ARI: necessary to adjust this value. Default is 100 ms. + - The ARI version has been changed from 1.3.0 to 1.4.0. This is to reflect + the backwards compatible changes listed in the CHANGES file. + chan_dahdi: - Added the inband_on_setup_ack compatibility option to chan_dahdi.conf to deal with switches that don't send an inband progress indication in the diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 978151ab1b..66dafb1bea 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.3.0" +#define AMI_VERSION "2.4.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 4b3da53867..132dd641a6 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/applications.{format}", diff --git a/rest-api/api-docs/asterisk.json b/rest-api/api-docs/asterisk.json index 97228f3876..75934a89d7 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/asterisk.{format}", diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json index ccc6477193..8d2de70424 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/bridges.{format}", diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json index 96dbebd7d3..77ad3331e8 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/channels.{format}", diff --git a/rest-api/api-docs/deviceStates.json b/rest-api/api-docs/deviceStates.json index f4097a8288..af03a8c8a0 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/deviceStates.{format}", diff --git a/rest-api/api-docs/endpoints.json b/rest-api/api-docs/endpoints.json index 948f03c7b2..12b9f2e146 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/endpoints.{format}", diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json index 3d07e36131..cf93f4b00e 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.2", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/events.{format}", diff --git a/rest-api/api-docs/mailboxes.json b/rest-api/api-docs/mailboxes.json index 8f5c26909e..63392c6f32 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/mailboxes.{format}", diff --git a/rest-api/api-docs/playbacks.json b/rest-api/api-docs/playbacks.json index 9e77605ca9..9c4029cf90 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/playbacks.{format}", diff --git a/rest-api/api-docs/recordings.json b/rest-api/api-docs/recordings.json index 886d5651b7..1f825a2b0f 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/recordings.{format}", diff --git a/rest-api/api-docs/sounds.json b/rest-api/api-docs/sounds.json index 329a429864..0678e40d60 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/stasis", "resourcePath": "/api-docs/sounds.{format}", diff --git a/rest-api/resources.json b/rest-api/resources.json index 5521582e2f..1f7ce3792c 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.3.0", + "apiVersion": "1.4.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/ari", "apis": [