Prepare Asterisk 17 Branch

Change-Id: Idb79a69646d2511e7bf1573b9b0322cc22ea54e8
7 years ago · 80d8dce6af
parent 32642b83ea
commit 80d8dce6af
14 changed files with 3 additions and 14 deletions
--- 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
--- 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
--- 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:
--- 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:
--- 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.
--- 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
--- 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:
--- 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:
--- 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.
--- 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
--- 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.
--- 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.
--- 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 */

--- 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": "4.0.0",
+	"apiVersion": "5.0.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/ari",
 	"apis": [