<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11632">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update master for Asterisk 18<br><br>Change-Id: I8b8ed97001446fab0c14d7c89391ee572fb29dd6<br>---<br>D doc/CHANGES-staging/app_attended_transfer.txt<br>D doc/CHANGES-staging/app_blind_transfer.txt<br>D doc/CHANGES-staging/app_confbridge_remb_behavior_all.txt<br>D doc/CHANGES-staging/app_dial_ringtime_progresstime.txt<br>D doc/CHANGES-staging/app_readexten_pound.txt<br>D doc/CHANGES-staging/bridging_stasis_cache.txt<br>D doc/CHANGES-staging/chan_sip_deprecated.txt<br>D doc/CHANGES-staging/channels_stasis_cache.txt<br>D doc/CHANGES-staging/pbx_dundi_ipv6.txt<br>D doc/CHANGES-staging/res_pjsip_add_norefersub_global_config.txt<br>D doc/CHANGES-staging/res_rtp_asterisk_dtls_fragmentation.txt<br>D doc/CHANGES-staging/rtp_ice_include_local_address.txt<br>D doc/UPGRADE-staging/Build_all_3_app_voicemail_variants_at_the_same_time.txt<br>D doc/UPGRADE-staging/applications_jabberstatus.txt<br>D doc/UPGRADE-staging/bridging_stasis_cache.txt<br>D doc/UPGRADE-staging/chan_pjsip_refer_fix.txt<br>D doc/UPGRADE-staging/chan_sip_deprecated.txt<br>D doc/UPGRADE-staging/channels_stasis_cache.txt<br>D doc/UPGRADE-staging/func_callerid_callerpres.txt<br>D doc/UPGRADE-staging/install_headers.txt<br>D doc/UPGRADE-staging/res_parking_parkingslot.txt<br>D doc/UPGRADE-staging/res_xmpp_jabberstatus.txt<br>M include/asterisk/manager.h<br>M rest-api-templates/make_ari_stubs.py<br>M rest-api/resources.json<br>25 files changed, 3 insertions(+), 215 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/32/11632/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/CHANGES-staging/app_attended_transfer.txt b/doc/CHANGES-staging/app_attended_transfer.txt</span><br><span>deleted file mode 100644</span><br><span>index 97929e4..0000000</span><br><span>--- a/doc/CHANGES-staging/app_attended_transfer.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: AttendedTransfer</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A new application, this will queue up attended transfer to the given extension.</span><br><span>diff --git a/doc/CHANGES-staging/app_blind_transfer.txt b/doc/CHANGES-staging/app_blind_transfer.txt</span><br><span>deleted file mode 100644</span><br><span>index dc86df0..0000000</span><br><span>--- a/doc/CHANGES-staging/app_blind_transfer.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: BlindTransfer</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A new application, this will redirect all channels currently</span><br><span style="color: hsl(0, 100%, 40%);">-bridged to the caller channel to the specified destination.</span><br><span>diff --git a/doc/CHANGES-staging/app_confbridge_remb_behavior_all.txt b/doc/CHANGES-staging/app_confbridge_remb_behavior_all.txt</span><br><span>deleted file mode 100644</span><br><span>index 6110a6f..0000000</span><br><span>--- a/doc/CHANGES-staging/app_confbridge_remb_behavior_all.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: ConfBridge</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Add "average_all", "highest_all", and "lowest_all" values for</span><br><span style="color: hsl(0, 100%, 40%);">-the remb_behavior option. These values operate on a bridge</span><br><span style="color: hsl(0, 100%, 40%);">-level instead of a per-source level. This means that a single</span><br><span style="color: hsl(0, 100%, 40%);">-REMB value is calculated and sent to every sender, instead of</span><br><span style="color: hsl(0, 100%, 40%);">-a REMB value that is unique for the specific sender..</span><br><span>diff --git a/doc/CHANGES-staging/app_dial_ringtime_progresstime.txt b/doc/CHANGES-staging/app_dial_ringtime_progresstime.txt</span><br><span>deleted file mode 100644</span><br><span>index 9b5cdd5..0000000</span><br><span>--- a/doc/CHANGES-staging/app_dial_ringtime_progresstime.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Dial</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Add RINGTIME and RINGTIME_MS variables containing respectively seconds and</span><br><span style="color: hsl(0, 100%, 40%);">-milliseconds between creation of the dialing channel and receiving the first</span><br><span style="color: hsl(0, 100%, 40%);">-RINGING signal</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Add PROGRESSTIME and PROGRESSTIME_MS variables analogous to the above with respect to</span><br><span style="color: hsl(0, 100%, 40%);">-the PROGRESS signal. Shorter of these two times should be equivalent to</span><br><span style="color: hsl(0, 100%, 40%);">-the PDD (Post Dial Delay) value</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Add DIALEDTIME_MS and ANSWEREDTIME_MS variables to get millisecond resolution</span><br><span style="color: hsl(0, 100%, 40%);">-versions of DIALEDTIME and ANSWEREDTIME</span><br><span>diff --git a/doc/CHANGES-staging/app_readexten_pound.txt b/doc/CHANGES-staging/app_readexten_pound.txt</span><br><span>deleted file mode 100644</span><br><span>index 551f751..0000000</span><br><span>--- a/doc/CHANGES-staging/app_readexten_pound.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: ReadExten</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Add 'p' option to stop reading extension if user presses '#' key.</span><br><span>diff --git a/doc/CHANGES-staging/bridging_stasis_cache.txt b/doc/CHANGES-staging/bridging_stasis_cache.txt</span><br><span>deleted file mode 100644</span><br><span>index df6b3cd..0000000</span><br><span>--- a/doc/CHANGES-staging/bridging_stasis_cache.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,36 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Bridging</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The bridging core no longer uses the stasis cache for bridge</span><br><span style="color: hsl(0, 100%, 40%);">-snapshots.  The latest bridge snapshot is now stored on the</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge structure itself.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The following APIs are no longer available since the stasis cache</span><br><span style="color: hsl(0, 100%, 40%);">-is no longer used:</span><br><span style="color: hsl(0, 100%, 40%);">-  ast_bridge_topic_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-  ast_bridge_topic_all_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A topic pool is now used for individual bridge topics.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_cache() function was removed since there's no</span><br><span style="color: hsl(0, 100%, 40%);">-longer a separate container of snapshots.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A new function "ast_bridges()" was created to retrieve the</span><br><span style="color: hsl(0, 100%, 40%);">-container of all bridges.  Users formerly calling</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge_cache() can use the new function to iterate over</span><br><span style="color: hsl(0, 100%, 40%);">-bridges and retrieve the latest snapshot directly from the</span><br><span style="color: hsl(0, 100%, 40%);">-bridge.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_snapshot_get_latest() function was renamed to</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge_get_snapshot_by_uniqueid().</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A new function "ast_bridge_get_snapshot()" was created to retrieve</span><br><span style="color: hsl(0, 100%, 40%);">-the bridge snapshot directly from the bridge structure.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_topic_all() function now returns a normal topic</span><br><span style="color: hsl(0, 100%, 40%);">-not a cached one so you can't use stasis cache functions on it</span><br><span style="color: hsl(0, 100%, 40%);">-either.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_snapshot_type() stasis message now has the</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge_snapshot_update structure as it's data.  It contains</span><br><span style="color: hsl(0, 100%, 40%);">-the last snapshot and the new one.</span><br><span>diff --git a/doc/CHANGES-staging/chan_sip_deprecated.txt b/doc/CHANGES-staging/chan_sip_deprecated.txt</span><br><span>deleted file mode 100644</span><br><span>index cffd1db..0000000</span><br><span>--- a/doc/CHANGES-staging/chan_sip_deprecated.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: chan_sip</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The chan_sip module is now deprecated, users should migrate to the</span><br><span style="color: hsl(0, 100%, 40%);">-replacement module chan_pjsip.  See guides at the Asterisk Wiki:</span><br><span style="color: hsl(0, 100%, 40%);">-  https://wiki.asterisk.org/wiki/x/tAHOAQ</span><br><span style="color: hsl(0, 100%, 40%);">-  https://wiki.asterisk.org/wiki/x/hYCLAQ</span><br><span>diff --git a/doc/CHANGES-staging/channels_stasis_cache.txt b/doc/CHANGES-staging/channels_stasis_cache.txt</span><br><span>deleted file mode 100644</span><br><span>index b4dbfc3..0000000</span><br><span>--- a/doc/CHANGES-staging/channels_stasis_cache.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,16 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Channels</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The core no longer uses the stasis cache for channels snapshots.</span><br><span style="color: hsl(0, 100%, 40%);">-The following APIs are no longer available:</span><br><span style="color: hsl(0, 100%, 40%);">-    ast_channel_topic_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-    ast_channel_topic_all_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_channel_cache_all() and ast_channel_cache_by_name() functions</span><br><span style="color: hsl(0, 100%, 40%);">-now returns an ao2_container of ast_channel_snapshots rather than a</span><br><span style="color: hsl(0, 100%, 40%);">-container of stasis_messages therefore you can't call stasis_cache</span><br><span style="color: hsl(0, 100%, 40%);">-functions on it.</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_channel_topic_all() function now returns a normal topic,</span><br><span style="color: hsl(0, 100%, 40%);">-not a cached one so you can't use stasis cache functions on it either.</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_channel_snapshot_type() stasis message now has the</span><br><span style="color: hsl(0, 100%, 40%);">-ast_channel_snapshot_update structure as it's data.</span><br><span style="color: hsl(0, 100%, 40%);">-ast_channel_snapshot_get_latest() still returns the latest snapshot.</span><br><span>diff --git a/doc/CHANGES-staging/pbx_dundi_ipv6.txt b/doc/CHANGES-staging/pbx_dundi_ipv6.txt</span><br><span>deleted file mode 100644</span><br><span>index c15ae44..0000000</span><br><span>--- a/doc/CHANGES-staging/pbx_dundi_ipv6.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: pbx_dundi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The DUNDi PBX module now supports IPv4/IPv6 dual binding.</span><br><span>diff --git a/doc/CHANGES-staging/res_pjsip_add_norefersub_global_config.txt b/doc/CHANGES-staging/res_pjsip_add_norefersub_global_config.txt</span><br><span>deleted file mode 100644</span><br><span>index e0573bc..0000000</span><br><span>--- a/doc/CHANGES-staging/res_pjsip_add_norefersub_global_config.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: res_pjsip</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Added a new PJSIP global setting called norefersub.</span><br><span style="color: hsl(0, 100%, 40%);">-Default is true to keep support working as before.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-res_pjsip_refer configures PJSIP norefersub capability accordingly.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Checks the PJSIP global setting value.</span><br><span style="color: hsl(0, 100%, 40%);">-If it is true (default) it adds the norefersub capability to PJSIP.</span><br><span style="color: hsl(0, 100%, 40%);">-If it is false (disabled) it does not add the norefersub capability</span><br><span style="color: hsl(0, 100%, 40%);">-to PJSIP.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-This is useful for Cisco switches that do not follow RFC4488.</span><br><span>diff --git a/doc/CHANGES-staging/res_rtp_asterisk_dtls_fragmentation.txt b/doc/CHANGES-staging/res_rtp_asterisk_dtls_fragmentation.txt</span><br><span>deleted file mode 100644</span><br><span>index dfc5984..0000000</span><br><span>--- a/doc/CHANGES-staging/res_rtp_asterisk_dtls_fragmentation.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: res_rtp_asterisk</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DTLS packets will now be fragmented according to the MTU as set in rtp.conf. This</span><br><span style="color: hsl(0, 100%, 40%);">-allows larger certificates to be used for the DTLS negotiation. By default this value</span><br><span style="color: hsl(0, 100%, 40%);">-is 1200.</span><br><span>diff --git a/doc/CHANGES-staging/rtp_ice_include_local_address.txt b/doc/CHANGES-staging/rtp_ice_include_local_address.txt</span><br><span>deleted file mode 100644</span><br><span>index e5a65e5..0000000</span><br><span>--- a/doc/CHANGES-staging/rtp_ice_include_local_address.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: RTP/ICE</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-You can now indicate that you'd like an ice_host_candidate's local address</span><br><span style="color: hsl(0, 100%, 40%);">-to be published as well as the mapped address.  See the sample rtp.conf</span><br><span style="color: hsl(0, 100%, 40%);">-for more information.</span><br><span>diff --git a/doc/UPGRADE-staging/Build_all_3_app_voicemail_variants_at_the_same_time.txt b/doc/UPGRADE-staging/Build_all_3_app_voicemail_variants_at_the_same_time.txt</span><br><span>deleted file mode 100644</span><br><span>index 22fb4f7..0000000</span><br><span>--- a/doc/UPGRADE-staging/Build_all_3_app_voicemail_variants_at_the_same_time.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: app_voicemail.c</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The "Voicemail Build Options" section of menuselect has been removed along with</span><br><span style="color: hsl(0, 100%, 40%);">-the FILE_STORAGE, ODBC_STORAGE and IMAP_STORAGE menuselect options.  All 3 variants</span><br><span style="color: hsl(0, 100%, 40%);">-of the voicemail app can now be built at the same by enabling app_voicemail,</span><br><span style="color: hsl(0, 100%, 40%);">-app_voicemail_imap, and app_voicemail_odbc under the "Applications" section.</span><br><span style="color: hsl(0, 100%, 40%);">-By default, only app_voicemail is enabled.  Also, the modules.conf sample has</span><br><span style="color: hsl(0, 100%, 40%);">-been updated to "noload" app_voicemail_imap and app_voicemail_odbc should they</span><br><span style="color: hsl(0, 100%, 40%);">-all be built.  Packagers must update their build scripts appropriately.</span><br><span>diff --git a/doc/UPGRADE-staging/applications_jabberstatus.txt b/doc/UPGRADE-staging/applications_jabberstatus.txt</span><br><span>deleted file mode 100644</span><br><span>index 93e4112..0000000</span><br><span>--- a/doc/UPGRADE-staging/applications_jabberstatus.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Applications</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-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>deleted file mode 100644</span><br><span>index df6b3cd..0000000</span><br><span>--- a/doc/UPGRADE-staging/bridging_stasis_cache.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,36 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Bridging</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The bridging core no longer uses the stasis cache for bridge</span><br><span style="color: hsl(0, 100%, 40%);">-snapshots.  The latest bridge snapshot is now stored on the</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge structure itself.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The following APIs are no longer available since the stasis cache</span><br><span style="color: hsl(0, 100%, 40%);">-is no longer used:</span><br><span style="color: hsl(0, 100%, 40%);">-  ast_bridge_topic_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-  ast_bridge_topic_all_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A topic pool is now used for individual bridge topics.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_cache() function was removed since there's no</span><br><span style="color: hsl(0, 100%, 40%);">-longer a separate container of snapshots.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A new function "ast_bridges()" was created to retrieve the</span><br><span style="color: hsl(0, 100%, 40%);">-container of all bridges.  Users formerly calling</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge_cache() can use the new function to iterate over</span><br><span style="color: hsl(0, 100%, 40%);">-bridges and retrieve the latest snapshot directly from the</span><br><span style="color: hsl(0, 100%, 40%);">-bridge.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_snapshot_get_latest() function was renamed to</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge_get_snapshot_by_uniqueid().</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-A new function "ast_bridge_get_snapshot()" was created to retrieve</span><br><span style="color: hsl(0, 100%, 40%);">-the bridge snapshot directly from the bridge structure.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_topic_all() function now returns a normal topic</span><br><span style="color: hsl(0, 100%, 40%);">-not a cached one so you can't use stasis cache functions on it</span><br><span style="color: hsl(0, 100%, 40%);">-either.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_bridge_snapshot_type() stasis message now has the</span><br><span style="color: hsl(0, 100%, 40%);">-ast_bridge_snapshot_update structure as it's data.  It contains</span><br><span style="color: hsl(0, 100%, 40%);">-the last snapshot and the new one.</span><br><span>diff --git a/doc/UPGRADE-staging/chan_pjsip_refer_fix.txt b/doc/UPGRADE-staging/chan_pjsip_refer_fix.txt</span><br><span>deleted file mode 100644</span><br><span>index 301930f..0000000</span><br><span>--- a/doc/UPGRADE-staging/chan_pjsip_refer_fix.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: chan_pjsip</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Core</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-res_pjsip_pubsub is now required so call transfer progress can be monitored</span><br><span style="color: hsl(0, 100%, 40%);">-and reported in the channel variable TRANSFERSTATUS.</span><br><span>diff --git a/doc/UPGRADE-staging/chan_sip_deprecated.txt b/doc/UPGRADE-staging/chan_sip_deprecated.txt</span><br><span>deleted file mode 100644</span><br><span>index cffd1db..0000000</span><br><span>--- a/doc/UPGRADE-staging/chan_sip_deprecated.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: chan_sip</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The chan_sip module is now deprecated, users should migrate to the</span><br><span style="color: hsl(0, 100%, 40%);">-replacement module chan_pjsip.  See guides at the Asterisk Wiki:</span><br><span style="color: hsl(0, 100%, 40%);">-  https://wiki.asterisk.org/wiki/x/tAHOAQ</span><br><span style="color: hsl(0, 100%, 40%);">-  https://wiki.asterisk.org/wiki/x/hYCLAQ</span><br><span>diff --git a/doc/UPGRADE-staging/channels_stasis_cache.txt b/doc/UPGRADE-staging/channels_stasis_cache.txt</span><br><span>deleted file mode 100644</span><br><span>index b4dbfc3..0000000</span><br><span>--- a/doc/UPGRADE-staging/channels_stasis_cache.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,16 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Channels</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The core no longer uses the stasis cache for channels snapshots.</span><br><span style="color: hsl(0, 100%, 40%);">-The following APIs are no longer available:</span><br><span style="color: hsl(0, 100%, 40%);">-    ast_channel_topic_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-    ast_channel_topic_all_cached()</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_channel_cache_all() and ast_channel_cache_by_name() functions</span><br><span style="color: hsl(0, 100%, 40%);">-now returns an ao2_container of ast_channel_snapshots rather than a</span><br><span style="color: hsl(0, 100%, 40%);">-container of stasis_messages therefore you can't call stasis_cache</span><br><span style="color: hsl(0, 100%, 40%);">-functions on it.</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_channel_topic_all() function now returns a normal topic,</span><br><span style="color: hsl(0, 100%, 40%);">-not a cached one so you can't use stasis cache functions on it either.</span><br><span style="color: hsl(0, 100%, 40%);">-The ast_channel_snapshot_type() stasis message now has the</span><br><span style="color: hsl(0, 100%, 40%);">-ast_channel_snapshot_update structure as it's data.</span><br><span style="color: hsl(0, 100%, 40%);">-ast_channel_snapshot_get_latest() still returns the latest snapshot.</span><br><span>diff --git a/doc/UPGRADE-staging/func_callerid_callerpres.txt b/doc/UPGRADE-staging/func_callerid_callerpres.txt</span><br><span>deleted file mode 100644</span><br><span>index 003d67d..0000000</span><br><span>--- a/doc/UPGRADE-staging/func_callerid_callerpres.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: func_callerid</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The CALLERPRES() dialplan function, deprecated in Asterisk 1.8, has been</span><br><span style="color: hsl(0, 100%, 40%);">-removed.</span><br><span>diff --git a/doc/UPGRADE-staging/install_headers.txt b/doc/UPGRADE-staging/install_headers.txt</span><br><span>deleted file mode 100644</span><br><span>index d932512..0000000</span><br><span>--- a/doc/UPGRADE-staging/install_headers.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: Build</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Asterisk headers are no longer installed and uninstalled automatically when</span><br><span style="color: hsl(0, 100%, 40%);">-performing a "make install" or a "make uninstall".  To install/uninstall the</span><br><span style="color: hsl(0, 100%, 40%);">-headers, use "make install-headers" and "make uninstall-headers".  The headers</span><br><span style="color: hsl(0, 100%, 40%);">-also continue to be uninstalled when performing a "make uninstall-all".</span><br><span>diff --git a/doc/UPGRADE-staging/res_parking_parkingslot.txt b/doc/UPGRADE-staging/res_parking_parkingslot.txt</span><br><span>deleted file mode 100644</span><br><span>index b5b4cbc..0000000</span><br><span>--- a/doc/UPGRADE-staging/res_parking_parkingslot.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: res_parking</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The PARKINGSLOT channel variable, deprecated in Asterisk 12 in favor of the</span><br><span style="color: hsl(0, 100%, 40%);">-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>deleted file mode 100644</span><br><span>index 4400278..0000000</span><br><span>--- a/doc/UPGRADE-staging/res_xmpp_jabberstatus.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: res_xmpp</span><br><span style="color: hsl(0, 100%, 40%);">-Master-Only: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-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..d198bd4 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                     "7.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-templates/make_ari_stubs.py b/rest-api-templates/make_ari_stubs.py</span><br><span>index 5168146..9a340d3 100755</span><br><span>--- a/rest-api-templates/make_ari_stubs.py</span><br><span>+++ b/rest-api-templates/make_ari_stubs.py</span><br><span>@@ -42,7 +42,7 @@</span><br><span>     """</span><br><span>     return os.path.join(TOPDIR, file)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-WIKI_PREFIX = 'Asterisk 17'</span><br><span style="color: hsl(120, 100%, 40%);">+WIKI_PREFIX = 'Asterisk 18'</span><br><span> </span><br><span> API_TRANSFORMS = [</span><br><span>     Transform(rel('api.wiki.mustache'),</span><br><span>diff --git a/rest-api/resources.json b/rest-api/resources.json</span><br><span>index bbaf72d..6de3f52 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": "6.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/+/11632">change 11632</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/+/11632"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8b8ed97001446fab0c14d7c89391ee572fb29dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 11632 </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>