<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11633">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Prepare Asterisk 17 Branch<br><br>Change-Id: Idb79a69646d2511e7bf1573b9b0322cc22ea54e8<br>---<br>M .gitreview<br>M doc/CHANGES-staging/bridging_stasis_cache.txt<br>M doc/CHANGES-staging/chan_sip_deprecated.txt<br>M doc/CHANGES-staging/channels_stasis_cache.txt<br>M doc/UPGRADE-staging/applications_jabberstatus.txt<br>M doc/UPGRADE-staging/bridging_stasis_cache.txt<br>M doc/UPGRADE-staging/chan_sip_deprecated.txt<br>M doc/UPGRADE-staging/channels_stasis_cache.txt<br>M doc/UPGRADE-staging/func_callerid_callerpres.txt<br>M doc/UPGRADE-staging/install_headers.txt<br>M doc/UPGRADE-staging/res_parking_parkingslot.txt<br>M doc/UPGRADE-staging/res_xmpp_jabberstatus.txt<br>M include/asterisk/manager.h<br>M rest-api/resources.json<br>14 files changed, 3 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/33/11633/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitreview b/.gitreview</span><br><span>index 21f9eff..7dad033 100644</span><br><span>--- a/.gitreview</span><br><span>+++ b/.gitreview</span><br><span>@@ -1,5 +1,5 @@</span><br><span> [gerrit]</span><br><span style="color: hsl(0, 100%, 40%);">-defaultbranch=master</span><br><span style="color: hsl(120, 100%, 40%);">+defaultbranch=17</span><br><span> #</span><br><span> # Intentional padding to ensure it is possible to point a commit</span><br><span> # to an alternative gerrit server/repository without breaking</span><br><span>diff --git a/doc/CHANGES-staging/bridging_stasis_cache.txt b/doc/CHANGES-staging/bridging_stasis_cache.txt</span><br><span>index df6b3cd..c39d290 100644</span><br><span>--- a/doc/CHANGES-staging/bridging_stasis_cache.txt</span><br><span>+++ b/doc/CHANGES-staging/bridging_stasis_cache.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: Bridging</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The bridging core no longer uses the stasis cache for bridge</span><br><span> snapshots. The latest bridge snapshot is now stored on the</span><br><span>diff --git a/doc/CHANGES-staging/chan_sip_deprecated.txt b/doc/CHANGES-staging/chan_sip_deprecated.txt</span><br><span>index cffd1db..04ac21c 100644</span><br><span>--- a/doc/CHANGES-staging/chan_sip_deprecated.txt</span><br><span>+++ b/doc/CHANGES-staging/chan_sip_deprecated.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: chan_sip</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The chan_sip module is now deprecated, users should migrate to the</span><br><span> replacement module chan_pjsip. See guides at the Asterisk Wiki:</span><br><span>diff --git a/doc/CHANGES-staging/channels_stasis_cache.txt b/doc/CHANGES-staging/channels_stasis_cache.txt</span><br><span>index b4dbfc3..1743fea 100644</span><br><span>--- a/doc/CHANGES-staging/channels_stasis_cache.txt</span><br><span>+++ b/doc/CHANGES-staging/channels_stasis_cache.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: Channels</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The core no longer uses the stasis cache for channels snapshots.</span><br><span> The following APIs are no longer available:</span><br><span>diff --git a/doc/UPGRADE-staging/applications_jabberstatus.txt b/doc/UPGRADE-staging/applications_jabberstatus.txt</span><br><span>index 93e4112..4adb1dc 100644</span><br><span>--- a/doc/UPGRADE-staging/applications_jabberstatus.txt</span><br><span>+++ b/doc/UPGRADE-staging/applications_jabberstatus.txt</span><br><span>@@ -1,4 +1,3 @@</span><br><span> Subject: Applications</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The JabberStatus application, deprecated in Asterisk 12, has been removed.</span><br><span>diff --git a/doc/UPGRADE-staging/bridging_stasis_cache.txt b/doc/UPGRADE-staging/bridging_stasis_cache.txt</span><br><span>index df6b3cd..c39d290 100644</span><br><span>--- a/doc/UPGRADE-staging/bridging_stasis_cache.txt</span><br><span>+++ b/doc/UPGRADE-staging/bridging_stasis_cache.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: Bridging</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The bridging core no longer uses the stasis cache for bridge</span><br><span> snapshots. The latest bridge snapshot is now stored on the</span><br><span>diff --git a/doc/UPGRADE-staging/chan_sip_deprecated.txt b/doc/UPGRADE-staging/chan_sip_deprecated.txt</span><br><span>index cffd1db..04ac21c 100644</span><br><span>--- a/doc/UPGRADE-staging/chan_sip_deprecated.txt</span><br><span>+++ b/doc/UPGRADE-staging/chan_sip_deprecated.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: chan_sip</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The chan_sip module is now deprecated, users should migrate to the</span><br><span> replacement module chan_pjsip. See guides at the Asterisk Wiki:</span><br><span>diff --git a/doc/UPGRADE-staging/channels_stasis_cache.txt b/doc/UPGRADE-staging/channels_stasis_cache.txt</span><br><span>index b4dbfc3..1743fea 100644</span><br><span>--- a/doc/UPGRADE-staging/channels_stasis_cache.txt</span><br><span>+++ b/doc/UPGRADE-staging/channels_stasis_cache.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: Channels</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The core no longer uses the stasis cache for channels snapshots.</span><br><span> The following APIs are no longer available:</span><br><span>diff --git a/doc/UPGRADE-staging/func_callerid_callerpres.txt b/doc/UPGRADE-staging/func_callerid_callerpres.txt</span><br><span>index 003d67d..b128cc6 100644</span><br><span>--- a/doc/UPGRADE-staging/func_callerid_callerpres.txt</span><br><span>+++ b/doc/UPGRADE-staging/func_callerid_callerpres.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: func_callerid</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The CALLERPRES() dialplan function, deprecated in Asterisk 1.8, has been</span><br><span> removed.</span><br><span>diff --git a/doc/UPGRADE-staging/install_headers.txt b/doc/UPGRADE-staging/install_headers.txt</span><br><span>index d932512..2453781 100644</span><br><span>--- a/doc/UPGRADE-staging/install_headers.txt</span><br><span>+++ b/doc/UPGRADE-staging/install_headers.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: Build</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> Asterisk headers are no longer installed and uninstalled automatically when</span><br><span> performing a "make install" or a "make uninstall". To install/uninstall the</span><br><span>diff --git a/doc/UPGRADE-staging/res_parking_parkingslot.txt b/doc/UPGRADE-staging/res_parking_parkingslot.txt</span><br><span>index b5b4cbc..1ddcaeb 100644</span><br><span>--- a/doc/UPGRADE-staging/res_parking_parkingslot.txt</span><br><span>+++ b/doc/UPGRADE-staging/res_parking_parkingslot.txt</span><br><span>@@ -1,5 +1,4 @@</span><br><span> Subject: res_parking</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The PARKINGSLOT channel variable, deprecated in Asterisk 12 in favor of the</span><br><span> PARKING_SPACE channel variable, will no longer be set.</span><br><span>diff --git a/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt b/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt</span><br><span>index 4400278..e2bacdb 100644</span><br><span>--- a/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt</span><br><span>+++ b/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt</span><br><span>@@ -1,4 +1,3 @@</span><br><span> Subject: res_xmpp</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span> </span><br><span> The JabberStatus application, deprecated in Asterisk 12, has been removed.</span><br><span>diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h</span><br><span>index 97d4b9c..f74ad01 100644</span><br><span>--- a/include/asterisk/manager.h</span><br><span>+++ b/include/asterisk/manager.h</span><br><span>@@ -54,7 +54,7 @@</span><br><span> - \ref manager.c Main manager code file</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define AMI_VERSION "5.0.0"</span><br><span style="color: hsl(120, 100%, 40%);">+#define AMI_VERSION "6.0.0"</span><br><span> #define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */</span><br><span> #define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */</span><br><span> </span><br><span>diff --git a/rest-api/resources.json b/rest-api/resources.json</span><br><span>index bbaf72d..136e53c 100644</span><br><span>--- a/rest-api/resources.json</span><br><span>+++ b/rest-api/resources.json</span><br><span>@@ -2,7 +2,7 @@</span><br><span> "_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",</span><br><span> "_author": "David M. Lee, II <dlee@digium.com>",</span><br><span> "_svn_revision": "$Revision$",</span><br><span style="color: hsl(0, 100%, 40%);">- "apiVersion": "4.0.0",</span><br><span style="color: hsl(120, 100%, 40%);">+ "apiVersion": "5.0.0",</span><br><span> "swaggerVersion": "1.1",</span><br><span> "basePath": "http://localhost:8088/ari",</span><br><span> "apis": [</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11633">change 11633</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11633"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: Idb79a69646d2511e7bf1573b9b0322cc22ea54e8 </div>
<div style="display:none"> Gerrit-Change-Number: 11633 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>