From c207825dc7c7a0f61da735ea30d8d3b437ad6c57 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 9 Dec 2009 23:35:24 +0000
Subject: [PATCH] Move an entry from CHANGES to UPGRADE.txt.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@234055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
CHANGES | 3 ---
UPGRADE.txt | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGES b/CHANGES
index 9c9e5da864..401ef67952 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 032ee64a65..c1fd29d765 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()
--
GitLab