[asterisk-commits] mjordan: trunk r418183 - in /trunk: ./ include/asterisk/ rest-api/ rest-api/a...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Jul 8 09:48:32 CDT 2014


Author: mjordan
Date: Tue Jul  8 09:48:30 2014
New Revision: 418183

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418183
Log:
manager/ARI: Update version to 2.4.0/1.4.0; Update UPGRADE.txt
........

Merged revisions 418182 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/manager.h
    trunk/rest-api/api-docs/applications.json
    trunk/rest-api/api-docs/asterisk.json
    trunk/rest-api/api-docs/bridges.json
    trunk/rest-api/api-docs/channels.json
    trunk/rest-api/api-docs/deviceStates.json
    trunk/rest-api/api-docs/endpoints.json
    trunk/rest-api/api-docs/events.json
    trunk/rest-api/api-docs/mailboxes.json
    trunk/rest-api/api-docs/playbacks.json
    trunk/rest-api/api-docs/recordings.json
    trunk/rest-api/api-docs/sounds.json
    trunk/rest-api/resources.json

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Tue Jul  8 09:48:30 2014
@@ -54,7 +54,7 @@
 - \ref manager.c Main manager code file
  */
 
-#define AMI_VERSION                     "2.3.0"
+#define AMI_VERSION                     "2.4.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 */
 

Modified: trunk/rest-api/api-docs/applications.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/applications.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/applications.json (original)
+++ trunk/rest-api/api-docs/applications.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/applications.{format}",

Modified: trunk/rest-api/api-docs/asterisk.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/asterisk.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/asterisk.json (original)
+++ trunk/rest-api/api-docs/asterisk.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/asterisk.{format}",

Modified: trunk/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/bridges.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/bridges.json (original)
+++ trunk/rest-api/api-docs/bridges.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/bridges.{format}",

Modified: trunk/rest-api/api-docs/channels.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/channels.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/channels.json (original)
+++ trunk/rest-api/api-docs/channels.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/channels.{format}",

Modified: trunk/rest-api/api-docs/deviceStates.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/deviceStates.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/deviceStates.json (original)
+++ trunk/rest-api/api-docs/deviceStates.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "Kevin Harwell <kharwell at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/deviceStates.{format}",

Modified: trunk/rest-api/api-docs/endpoints.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/endpoints.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/endpoints.json (original)
+++ trunk/rest-api/api-docs/endpoints.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/endpoints.{format}",

Modified: trunk/rest-api/api-docs/events.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/events.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/events.json (original)
+++ trunk/rest-api/api-docs/events.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.2",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/events.{format}",

Modified: trunk/rest-api/api-docs/mailboxes.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/mailboxes.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/mailboxes.json (original)
+++ trunk/rest-api/api-docs/mailboxes.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2013, Digium, Inc.",
 	"_author": "Jonathan Rose <jrose at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/mailboxes.{format}",

Modified: trunk/rest-api/api-docs/playbacks.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/playbacks.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/playbacks.json (original)
+++ trunk/rest-api/api-docs/playbacks.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/playbacks.{format}",

Modified: trunk/rest-api/api-docs/recordings.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/recordings.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/recordings.json (original)
+++ trunk/rest-api/api-docs/recordings.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/recordings.{format}",

Modified: trunk/rest-api/api-docs/sounds.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/sounds.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/api-docs/sounds.json (original)
+++ trunk/rest-api/api-docs/sounds.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/stasis",
 	"resourcePath": "/api-docs/sounds.{format}",

Modified: trunk/rest-api/resources.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/resources.json?view=diff&rev=418183&r1=418182&r2=418183
==============================================================================
--- trunk/rest-api/resources.json (original)
+++ trunk/rest-api/resources.json Tue Jul  8 09:48:30 2014
@@ -2,7 +2,7 @@
 	"_copyright": "Copyright (C) 2012 - 2013, Digium, Inc.",
 	"_author": "David M. Lee, II <dlee at digium.com>",
 	"_svn_revision": "$Revision$",
-	"apiVersion": "1.3.0",
+	"apiVersion": "1.4.0",
 	"swaggerVersion": "1.1",
 	"basePath": "http://localhost:8088/ari",
 	"apis": [




More information about the asterisk-commits mailing list