aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-09 23:35:24 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-09 23:35:24 +0000
commit86769df0582396ffbae353dd05968c6075237861 (patch)
tree2fe21eb9ca917c9838d57c9788636f852ce736c8
parent085b5143790ae2c53c493dbc7591638706dcb336 (diff)
Move an entry from CHANGES to UPGRADE.txt.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@234055 f38db490-d61c-443f-a65b-d21fe96a405b
-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()