Prepare Asterisk 17 Branch

Change-Id: Idb79a69646d2511e7bf1573b9b0322cc22ea54e8

diff --git a/.gitreview b/.gitreview
index 21f9efff85288368e002933bd6ec801d9ab60590..7dad033ba7b37bbf03f01e091c4a4695feff55fa 100644 (file)
--- 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 df6b3cd103a69b877cee8c7c64012be887d01341..c39d2908ffbe8dd07b7a9b98ebb04af9efec0649 100644 (file)
--- 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 cffd1db5657bcc4ae3466cf283bc394c88e596be..04ac21c7d2222704ecf8a45269d117a9dc482270 100644 (file)
--- 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 b4dbfc344659e7baea30d02ea1a8de69302082a9..1743fea170ac96be1dcfa59582b2aaf0aa0202c4 100644 (file)
--- 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 93e411297cbcfc69d3934d1d7671b313eaa031a8..4adb1dcf1f17a3068de62813444fdc1659ba11cf 100644 (file)
--- 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 df6b3cd103a69b877cee8c7c64012be887d01341..c39d2908ffbe8dd07b7a9b98ebb04af9efec0649 100644 (file)
--- 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 cffd1db5657bcc4ae3466cf283bc394c88e596be..04ac21c7d2222704ecf8a45269d117a9dc482270 100644 (file)
--- 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 b4dbfc344659e7baea30d02ea1a8de69302082a9..1743fea170ac96be1dcfa59582b2aaf0aa0202c4 100644 (file)
--- 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 003d67d6992f039acb30f67f1ce3de4172208de1..b128cc6e218893e896038887f25dc868d1b28f4a 100644 (file)
--- 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 d932512a1b3298aaa31cb7a7fc69fad7b506f20c..2453781a4f695811f464c0b097397289c2185af5 100644 (file)
--- 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 b5b4cbc392ffe358242441ce1f7706c58cb25aee..1ddcaebf291859f4625551fb6557f863280405ff 100644 (file)
--- 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 44002786327ea4b00df1bd7edcbda802147f9eca..e2bacdb4c87cd9c10c76231840d7b7e7b638f866 100644 (file)
--- 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 97d4b9c2984521a0cc6ff8027b82b6bfe4664637..f74ad017fef578aa9e3ce37381203d690beb97ec 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                     "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 bbaf72d547fbd957e26a3667115698d703c26a94..136e53caf1e4a82985eb628915daa044315e1547 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": "4.0.0",
+       "apiVersion": "5.0.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "apis": [