[asterisk-commits] twilson: trunk r331098 - in /trunk: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Aug  8 17:59:45 2011
New Revision: 331098

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331098
Log:
Merged revisions 331097 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331097 | twilson | 2011-08-08 17:59:01 -0500 (Mon, 08 Aug 2011) | 5 lines
  
  Bump the AMI protocol version to 1.2
  
  As a result of converting Unlink events that were missed in the AMI
  1.1 update to Bridge events, the AMI protocol version is being incremented.
........

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/UPGRADE.txt
    trunk/include/asterisk/manager.h

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

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=331098&r1=331097&r2=331098
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Mon Aug  8 17:59:45 2011
@@ -46,7 +46,8 @@
    filters that can be defined in manager.conf
  * The Unlink event is now a Bridge event with Bridgestatus: Unlink. Previous
    versions had some instances of the event converted, but others were left
-   as-is. All Unlink events should now be converted to Bridge events.
+   as-is. All Unlink events should now be converted to Bridge events. The AMI
+   protocol version number was incremented to 1.2 as a result of this change.
 
 Asterisk HTTP Server
 --------------------------

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=331098&r1=331097&r2=331098
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Mon Aug  8 17:59:45 2011
@@ -72,6 +72,12 @@
    astdb.sqlite3 exists, astdb2sqlite3 will be compiled automatically. Asterisk will
    convert an existing astdb to the SQLite3 version automatically at runtime.
 
+Manager:
+ - The AMI protocol version was incremented to 1.2 as a result of changing two
+   instances of the Unlink event to Bridge events. This change was documented
+   as part of the AMI 1.1 update, but two Unlink events were inadvertently left
+   unchanged.
+
 Module Support Level
  - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, 
    formats, funcs, pbx, and res have been updated to include MODULEINFO data

Modified: trunk/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=331098&r1=331097&r2=331098
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Mon Aug  8 17:59:45 2011
@@ -54,7 +54,7 @@
 - \ref manager.c Main manager code file
  */
 
-#define AMI_VERSION                     "1.1"
+#define AMI_VERSION                     "1.2"
 #define DEFAULT_MANAGER_PORT 5038	/* Default port for Asterisk management via TCP */
 
 /*! \name Constant return values