[asterisk-commits] rmudgett: trunk r422257 - in /trunk: ./ UPGRADE-13.txt

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Aug 28 12:29:16 2014
New Revision: 422257

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422257
Log:
Added ConfBridge AMI event note to UPGRADE.txt.
........

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

Merged revisions 422256 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/UPGRADE-13.txt

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

Modified: trunk/UPGRADE-13.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE-13.txt?view=diff&rev=422257&r1=422256&r2=422257
==============================================================================
--- trunk/UPGRADE-13.txt (original)
+++ trunk/UPGRADE-13.txt Thu Aug 28 12:29:16 2014
@@ -60,11 +60,14 @@
 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