From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 28 Aug 2014 17:25:16 +0000 (+0000)
Subject: Added ConfBridge AMI event note to UPGRADE.txt.
X-Git-Tag: 13.0.0-beta2~2^2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e698ef440673f1ff8a3ef9a98be636b0694f303;p=thirdparty%2Fasterisk.git

Added ConfBridge AMI event note to UPGRADE.txt.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@422256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 073923f767..32bbb78eac 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -60,11 +60,14 @@ Build System:
 Applications:
 
 ConfBridge:
-- The sound_place_into_conference sound used in Confbridge is now deprecated
-  and is no longer functional since it has been broken since its inception
-  and the fix involved using a different method to achieve the same goal. The
-  new method to achieve this functionality is by using sound_begin to play
-  a sound to the conference when waitmarked users are moved into the conference.
+ - The sound_place_into_conference sound used in Confbridge is now deprecated
+   and is no longer functional since it has been broken since its inception
+   and the fix involved using a different method to achieve the same goal. The
+   new method to achieve this functionality is by using sound_begin to play
+   a sound to the conference when waitmarked users are moved into the conference.
+
+ - Added 'Admin' header to ConfbridgeJoin, ConfbridgeLeave, ConfbridgeMute,
+   ConfbridgeUnmute, and ConfbridgeTalking AMI events.
 
 ControlPlayback:
  - The ControlPlayback and 'control stream file' AGI command will no longer