From: George Joseph Date: Fri, 26 Jul 2019 18:06:57 +0000 (-0600) Subject: Prepare Asterisk 17 Branch X-Git-Tag: 17.0.0-rc1~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80d8dce6afba095bbe353d217336957fe0d95e56;p=thirdparty%2Fasterisk.git Prepare Asterisk 17 Branch Change-Id: Idb79a69646d2511e7bf1573b9b0322cc22ea54e8 --- diff --git a/.gitreview b/.gitreview index 21f9efff85..7dad033ba7 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] -defaultbranch=master +defaultbranch=17 # # Intentional padding to ensure it is possible to point a commit # to an alternative gerrit server/repository without breaking diff --git a/doc/CHANGES-staging/bridging_stasis_cache.txt b/doc/CHANGES-staging/bridging_stasis_cache.txt index df6b3cd103..c39d2908ff 100644 --- a/doc/CHANGES-staging/bridging_stasis_cache.txt +++ b/doc/CHANGES-staging/bridging_stasis_cache.txt @@ -1,5 +1,4 @@ Subject: Bridging -Master-Only: true The bridging core no longer uses the stasis cache for bridge snapshots. The latest bridge snapshot is now stored on the diff --git a/doc/CHANGES-staging/chan_sip_deprecated.txt b/doc/CHANGES-staging/chan_sip_deprecated.txt index cffd1db565..04ac21c7d2 100644 --- a/doc/CHANGES-staging/chan_sip_deprecated.txt +++ b/doc/CHANGES-staging/chan_sip_deprecated.txt @@ -1,5 +1,4 @@ Subject: chan_sip -Master-Only: true The chan_sip module is now deprecated, users should migrate to the replacement module chan_pjsip. See guides at the Asterisk Wiki: diff --git a/doc/CHANGES-staging/channels_stasis_cache.txt b/doc/CHANGES-staging/channels_stasis_cache.txt index b4dbfc3446..1743fea170 100644 --- a/doc/CHANGES-staging/channels_stasis_cache.txt +++ b/doc/CHANGES-staging/channels_stasis_cache.txt @@ -1,5 +1,4 @@ Subject: Channels -Master-Only: true The core no longer uses the stasis cache for channels snapshots. The following APIs are no longer available: diff --git a/doc/UPGRADE-staging/applications_jabberstatus.txt b/doc/UPGRADE-staging/applications_jabberstatus.txt index 93e411297c..4adb1dcf1f 100644 --- a/doc/UPGRADE-staging/applications_jabberstatus.txt +++ b/doc/UPGRADE-staging/applications_jabberstatus.txt @@ -1,4 +1,3 @@ Subject: Applications -Master-Only: true The JabberStatus application, deprecated in Asterisk 12, has been removed. diff --git a/doc/UPGRADE-staging/bridging_stasis_cache.txt b/doc/UPGRADE-staging/bridging_stasis_cache.txt index df6b3cd103..c39d2908ff 100644 --- a/doc/UPGRADE-staging/bridging_stasis_cache.txt +++ b/doc/UPGRADE-staging/bridging_stasis_cache.txt @@ -1,5 +1,4 @@ Subject: Bridging -Master-Only: true The bridging core no longer uses the stasis cache for bridge snapshots. The latest bridge snapshot is now stored on the diff --git a/doc/UPGRADE-staging/chan_sip_deprecated.txt b/doc/UPGRADE-staging/chan_sip_deprecated.txt index cffd1db565..04ac21c7d2 100644 --- a/doc/UPGRADE-staging/chan_sip_deprecated.txt +++ b/doc/UPGRADE-staging/chan_sip_deprecated.txt @@ -1,5 +1,4 @@ Subject: chan_sip -Master-Only: true The chan_sip module is now deprecated, users should migrate to the replacement module chan_pjsip. See guides at the Asterisk Wiki: diff --git a/doc/UPGRADE-staging/channels_stasis_cache.txt b/doc/UPGRADE-staging/channels_stasis_cache.txt index b4dbfc3446..1743fea170 100644 --- a/doc/UPGRADE-staging/channels_stasis_cache.txt +++ b/doc/UPGRADE-staging/channels_stasis_cache.txt @@ -1,5 +1,4 @@ Subject: Channels -Master-Only: true The core no longer uses the stasis cache for channels snapshots. The following APIs are no longer available: diff --git a/doc/UPGRADE-staging/func_callerid_callerpres.txt b/doc/UPGRADE-staging/func_callerid_callerpres.txt index 003d67d699..b128cc6e21 100644 --- a/doc/UPGRADE-staging/func_callerid_callerpres.txt +++ b/doc/UPGRADE-staging/func_callerid_callerpres.txt @@ -1,5 +1,4 @@ Subject: func_callerid -Master-Only: true The CALLERPRES() dialplan function, deprecated in Asterisk 1.8, has been removed. diff --git a/doc/UPGRADE-staging/install_headers.txt b/doc/UPGRADE-staging/install_headers.txt index d932512a1b..2453781a4f 100644 --- a/doc/UPGRADE-staging/install_headers.txt +++ b/doc/UPGRADE-staging/install_headers.txt @@ -1,5 +1,4 @@ Subject: Build -Master-Only: true Asterisk headers are no longer installed and uninstalled automatically when performing a "make install" or a "make uninstall". To install/uninstall the diff --git a/doc/UPGRADE-staging/res_parking_parkingslot.txt b/doc/UPGRADE-staging/res_parking_parkingslot.txt index b5b4cbc392..1ddcaebf29 100644 --- a/doc/UPGRADE-staging/res_parking_parkingslot.txt +++ b/doc/UPGRADE-staging/res_parking_parkingslot.txt @@ -1,5 +1,4 @@ Subject: res_parking -Master-Only: true The PARKINGSLOT channel variable, deprecated in Asterisk 12 in favor of the PARKING_SPACE channel variable, will no longer be set. diff --git a/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt b/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt index 4400278632..e2bacdb4c8 100644 --- a/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt +++ b/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt @@ -1,4 +1,3 @@ Subject: res_xmpp -Master-Only: true The JabberStatus application, deprecated in Asterisk 12, has been removed. diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 97d4b9c298..f74ad017fe 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 "5.0.0" +#define AMI_VERSION "6.0.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/resources.json b/rest-api/resources.json index bbaf72d547..136e53caf1 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": "4.0.0", + "apiVersion": "5.0.0", "swaggerVersion": "1.1", "basePath": "http://localhost:8088/ari", "apis": [