summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2009-12-09 23:35:24 +0000
committerRussell Bryant <russell@russellbryant.com>2009-12-09 23:35:24 +0000
commitc207825dc7c7a0f61da735ea30d8d3b437ad6c57 (patch)
tree2fe21eb9ca917c9838d57c9788636f852ce736c8
parent2a1dce85b47008e607a8e9a55c8e918f3594ea83 (diff)
Move an entry from CHANGES to UPGRADE.txt.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@234055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--CHANGES3
-rw-r--r--UPGRADE.txt4
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 9c9e5da86..401ef6795 100644
--- a/CHANGES
+++ b/CHANGES
@@ -471,9 +471,6 @@ Miscellaneous
-------------
* The Asterisk CLI has a new command, "channel redirect", which is similar in
operation to the AMI Redirect action.
- * res_jabber: autoprune has been disabled by default, to avoid misconfiguration
- that would end up being interpreted as a bug once Asterisk started removing
- the contacts from a user list.
* extensions.conf now allows you to use keyword "same" to define an extension
without actually specifying an extension. It uses exactly the same pattern
as previously used on the last "exten" line. For example:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 032ee64a6..c1fd29d76 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -149,6 +149,10 @@ From 1.6.1 to 1.6.2:
* DAHDISendCallreroutingFacility() parameters are now comma-separated,
instead of the old pipe.
+* res_jabber: autoprune has been disabled by default, to avoid misconfiguration
+ that would end up being interpreted as a bug once Asterisk started removing
+ the contacts from a user list.
+
From 1.6.0.1 to 1.6.1:
* The ast_agi_register_multiple() and ast_agi_unregister_multiple()