summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-08-08 22:59:45 +0000
committerTerry Wilson <twilson@digium.com>2011-08-08 22:59:45 +0000
commit16acfefa74f3f2d2ec5cfc33b9b21b5d5648ba3f (patch)
treeb4e6baaadf93ecab3995851b00805fa338b12938
parent5901f2d0b19e691cf34b9709141445e6a813d159 (diff)
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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--CHANGES3
-rw-r--r--UPGRADE.txt6
-rw-r--r--include/asterisk/manager.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 4daf68b57..6b6720a5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,7 +46,8 @@ Asterisk Manager Interface
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
--------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index d7803b4d3..2a56216b5 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -72,6 +72,12 @@ Asterisk Database:
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
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index d3063fd45..08d68e931 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 "1.1"
+#define AMI_VERSION "1.2"
#define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */
/*! \name Constant return values