From: Leif Madsen <leif@leifmadsen.com>
Date: Thu, 3 Jun 2010 18:54:21 +0000 (+0000)
Subject: Merged revisions 267624 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a6c44cf30fac0b2b4702fc6e1eb840849b09828;p=thirdparty%2Fasterisk.git

Merged revisions 267624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r267624 | lmadsen | 2010-06-03 13:53:24 -0500 (Thu, 03 Jun 2010) | 7 lines

  Update UPGRADE.txt and CHANGE for CDR functionality changes.
  Updated the UPGRADE.txt and CHANGES file stating that CDR records will not be explicity
  written unless cdr.conf exists and is configured.

  (closes issue #17373)
  Reported by: wdoekes
  Tested by: pabelanger
........


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

diff --git a/CHANGES b/CHANGES
index f4b4fbd06c..b77c7fff98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -168,6 +168,12 @@ Miscellaneous
    instead of the /var/run/asterisk.pid where it used to be. This will make
    installs as non-root easier to manage.
 
+CDR
+---
+
+* The cdr.conf file must exist and be correctly programmed in order for CDR records to
+  be written; they will no longer be explicitly written.
+
 Asterisk Manager Interface
 --------------------------
  * When using the AMI over HTTP, you can now include a 'SuppressEvents' header (with
diff --git a/UPGRADE.txt b/UPGRADE.txt
index bd02694f7a..53182753e6 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -1,6 +1,6 @@
 ===========================================================
 ===
-=== Information for upgrading between Asterisk 1.6 versions
+=== Information for upgrading between Asterisk versions
 ===
 === These files document all the changes that MUST be taken
 === into account when upgrading between the Asterisk
@@ -123,6 +123,9 @@ From 1.6.1 to 1.6.2:
   that would end up being interpreted as a bug once Asterisk started removing 
   the contacts from a user list.
 
+* The cdr.conf file must exist and be configured correctly in order for CDR
+  records to be written.
+
 From 1.6.0.1 to 1.6.1:
 
 * The ast_agi_register_multiple() and ast_agi_unregister_multiple()