diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 15:01:34 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-12 15:01:34 +0000 |
commit | f46c403e345275f9b49f46b2bccb0a2025a7f38c (patch) | |
tree | 44ab596891bee56114423c8ab579c7b1df811cc4 /CHANGES | |
parent | a8ccf75d8fc86b365be1cc93dbcbab6697119bf4 (diff) |
Merged revisions 122128 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r122128 | murf | 2008-06-12 08:56:26 -0600 (Thu, 12 Jun 2008) | 9 lines
Merged revisions 122127 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line
Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122129 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'CHANGES')
-rw-r--r-- | CHANGES | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -387,8 +387,7 @@ Other Dialplan Application Changes from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(), - _busy(), failed(), etc, to all obey the LOCKED flag on cdr's in the chain, and - also the ast_cdr_setvar() func. + to obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func. Music On Hold Changes --------------------- |