<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11632">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Friendly Automation: Verified
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update master for Asterisk 18<br><br>Change-Id: I8b8ed97001446fab0c14d7c89391ee572fb29dd6<br>---<br>M include/asterisk/manager.h<br>M rest-api-templates/make_ari_stubs.py<br>M rest-api/resources.json<br>3 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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: 2 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>