aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--UPGRADE.txt4
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 139443d9e..eaf7007e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -128,9 +128,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 7600dc611..bd02694f7 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -119,6 +119,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()