Update master for Asterisk 18

Change-Id: I8b8ed97001446fab0c14d7c89391ee572fb29dd6

diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 97d4b9c2984521a0cc6ff8027b82b6bfe4664637..d198bd42fa6ffe21e4eaeb1c3ce2ad7da3ea726d 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                     "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 51681469f33f9b4ad6e656912b65479473ba4d7f..9a340d3fb2df875b640325a2b1381228a983a1ef 100755 (executable)
--- 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 bbaf72d547fbd957e26a3667115698d703c26a94..6de3f523b93f6dea74453456d471777596c7daf9 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": "6.0.0",
        "swaggerVersion": "1.1",
        "basePath": "http://localhost:8088/ari",
        "apis": [