From: Matthew Nicholson <mnicholson@digium.com>
Date: Tue, 16 Aug 2011 15:17:56 +0000 (+0000)
Subject: Merged revisions 332029 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=052ece39ee054740e4eb0aa52c3becc9c05c21dc;p=thirdparty%2Fasterisk.git

Merged revisions 332029 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r332029 | mnicholson | 2011-08-16 10:17:16 -0500 (Tue, 16 Aug 2011) | 2 lines

  Moved notes about 'storesipcause' to UPGRADE.txt from CHANGES

  AST-580
........


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

diff --git a/CHANGES b/CHANGES
index 7fb1785f1a..a3033409b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -190,9 +190,6 @@ res_fax
 SIP Changes
 -----------
  * Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
- * Setting of HASH(SIP_CAUSE,<slave-channel-name>) on channels is now disabled
-   by default. It can be enabled using the 'storesipcause' option. This feature
-   has a significant performance penalty.
 
 Queue changes
 -------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index bd6a63edec..ab8e778c1b 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -91,5 +91,10 @@ Module Support Level
    Deprecated modules are now marked to not build by default and must be explicitly
    enabled in menuselect.
 
+chan_sip:
+ - Setting of HASH(SIP_CAUSE,<slave-channel-name>) on channels is now disabled
+   by default. It can be enabled using the 'storesipcause' option. This feature
+   has a significant performance penalty.
+
 ===========================================================
 ===========================================================