From: George Joseph <gjoseph@digium.com>
Date: Fri, 26 Jul 2019 18:03:09 +0000 (-0600)
Subject: Update master for Asterisk 18
X-Git-Tag: 18.0.0-rc1~412
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d10028b98905fdb8ef3015ab56d8a0060602a44;p=thirdparty%2Fasterisk.git

Update master for Asterisk 18

Change-Id: I8b8ed97001446fab0c14d7c89391ee572fb29dd6
---

diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 97d4b9c298..d198bd42fa 100644
--- 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                     "7.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-templates/make_ari_stubs.py b/rest-api-templates/make_ari_stubs.py
index 51681469f3..9a340d3fb2 100755
--- a/rest-api-templates/make_ari_stubs.py
+++ b/rest-api-templates/make_ari_stubs.py
@@ -42,7 +42,7 @@ def rel(file):
     """
     return os.path.join(TOPDIR, file)
 
-WIKI_PREFIX = 'Asterisk 17'
+WIKI_PREFIX = 'Asterisk 18'
 
 API_TRANSFORMS = [
     Transform(rel('api.wiki.mustache'),
diff --git a/rest-api/resources.json b/rest-api/resources.json
index bbaf72d547..6de3f523b9 100644
--- 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": "6.0.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/ari",
 	"apis": [