Matthew Nicholson 88397ae314 Merged revisions 230628 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
  r230628 | mnicholson | 2009-11-20 15:01:10 -0600 (Fri, 20 Nov 2009) | 15 lines
  
  Merged revisions 230627 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r230627 | mnicholson | 2009-11-20 14:53:06 -0600 (Fri, 20 Nov 2009) | 8 lines
    
    Copy the peer CDR's userfield to the bridge CDR if it exists.  This is necessary for the recordagentcalls option in chan_agent to store the recorded file name in the bridge CDR.
    
    (closes issue #14590)
    Reported by: msetim
    Patches:
          queue_agent_userfield.patch uploaded by Laureano (license 265)
    Tested by: Laureano, mnicholson
  ........
................


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

2009-11-20 21:09:45 +00:00

..

db1-ast

Merged revisions 209887 via svnmerge from

2009-08-01 11:31:25 +00:00

editline

Merged revisions 179396 via svnmerge from

2009-03-02 20:17:55 +00:00

stdtime

Merged revisions 157974 via svnmerge from

2008-11-20 00:12:32 +00:00

abstract_jb.c

Merged revisions 228410 via svnmerge from

2009-11-06 16:43:36 +00:00

acl.c

Merged revisions 215955 via svnmerge from

2009-09-03 18:40:12 +00:00

adsistub.c

…

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

Merged revisions 213179 via svnmerge from

2009-08-19 22:39:42 +00:00

app.c

Merged revisions 210908 via svnmerge from

2009-08-06 21:32:23 +00:00

ast_expr2.c

Merged revisions 203444 via svnmerge from

2009-06-25 21:47:47 +00:00

ast_expr2.fl

Merged revisions 203444 via svnmerge from

2009-06-25 21:47:47 +00:00

ast_expr2.h

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

ast_expr2.y

Merged revisions 179973 via svnmerge from

2009-03-03 23:26:54 +00:00

ast_expr2f.c

Merged revisions 201678 via svnmerge from

2009-06-18 16:58:03 +00:00

asterisk.c

Merged revisions 221777 via svnmerge from

2009-10-02 00:03:52 +00:00

astfd.c

Merged revisions 228339 via svnmerge from

2009-11-06 15:44:44 +00:00

astmm.c

Merged revisions 203231 via svnmerge from

2009-06-25 18:54:15 +00:00

astobj2.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:33:01 +00:00

audiohook.c

Merged revisions 230583 via svnmerge from

2009-11-20 17:37:03 +00:00

autoservice.c

Merged revisions 223487 via svnmerge from

2009-10-11 17:27:45 +00:00

buildinfo.c

…

callerid.c

Merged revisions 145293,158010 from

2009-07-18 01:35:06 +00:00

cdr.c

AST-2009-005

2009-08-10 19:25:03 +00:00

channel.c

Merged revisions 228897 via svnmerge from

2009-11-09 15:39:09 +00:00

chanvars.c

…

cli.c

AST-2009-005

2009-08-10 19:25:03 +00:00

config.c

Merged revisions 219061 via svnmerge from

2009-09-16 23:52:26 +00:00

cryptostub.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:25:31 +00:00

cygload.c

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

db.c

Merged revisions 182450 via svnmerge from

2009-03-17 05:53:17 +00:00

devicestate.c

Merged revisions 205412 via svnmerge from

2009-07-08 22:17:08 +00:00

dial.c

Merged revisions 122557 via svnmerge from

2008-06-13 14:15:56 +00:00

dns.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

dnsmgr.c

AST-2009-005

2009-08-10 19:25:03 +00:00

dsp.c

Merged revisions 224932 via svnmerge from

2009-10-21 03:15:06 +00:00

ecdisa.h

…

enum.c

Merged revisions 180534 via svnmerge from

2009-03-06 17:28:52 +00:00

event.c

Merged revisions 209760-209761 via svnmerge from

2009-08-01 01:13:03 +00:00

features.c

Merged revisions 230628 via svnmerge from

2009-11-20 21:09:45 +00:00

file.c

Merged revisions 222880 via svnmerge from

2009-10-08 19:54:20 +00:00

fixedjitterbuf.c

…

fixedjitterbuf.h

Merged revisions 135851 via svnmerge from

2008-08-06 00:31:28 +00:00

frame.c

Merged revisions 224932 via svnmerge from

2009-10-21 03:15:06 +00:00

fskmodem_float.c

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

fskmodem_int.c

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

fskmodem.c

Merged revisions 132511 via svnmerge from

2008-07-21 21:02:55 +00:00

global_datastores.c

Merged revisions 172580 via svnmerge from

2009-01-30 23:58:31 +00:00

hashtab.c

Merged revisions 132050 via svnmerge from

2008-07-18 17:56:14 +00:00

http.c

AST-2009-005

2009-08-10 19:25:03 +00:00

image.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

indications.c

AST-2009-005

2009-08-10 19:25:03 +00:00

io.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:24:27 +00:00

jitterbuf.c

Merged revisions 174584 via svnmerge from

2009-02-10 18:19:45 +00:00

loader.c

Merged revisions 199051 via svnmerge from

2009-06-04 14:53:49 +00:00

logger.c

Merged revisions 221920 via svnmerge from

2009-10-02 03:05:28 +00:00

Makefile

Merged revisions 227372 via svnmerge from

2009-11-03 20:00:27 +00:00

manager.c

Merged revisions 226159 via svnmerge from

2009-10-27 20:23:54 +00:00

md5.c

…

netsock.c

Merged revisions 222873 via svnmerge from

2009-10-08 19:42:57 +00:00

pbx.c

Merged revisions 229499 via svnmerge from

2009-11-11 19:51:46 +00:00

plc.c

…

poll.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:24:27 +00:00

privacy.c

…

rtp.c

Merged revisions 224671 via svnmerge from

2009-10-19 23:50:31 +00:00

say.c

Merged revisions 221777 via svnmerge from

2009-10-02 00:03:52 +00:00

sched.c

Merged revisions 142355 via svnmerge from

2008-09-10 16:42:32 +00:00

sha1.c

…

slinfactory.c

Merged revisions 201056,201090 via svnmerge from

2009-06-16 19:34:39 +00:00

srv.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

ssl.c

Merged revisions 205532 via svnmerge from

2009-07-09 08:32:42 +00:00

strcompat.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

tcptls.c

Merged revisions 220365 via svnmerge from

2009-09-24 20:42:35 +00:00

tdd.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:25:31 +00:00

term.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

threadstorage.c

Merged revisions 164737 via svnmerge from

2008-12-16 17:15:43 +00:00

translate.c

Merged revisions 224932 via svnmerge from

2009-10-21 03:15:06 +00:00

udptl.c

Recorded merge of revisions 222110 via svnmerge from

2009-10-05 19:49:05 +00:00

ulaw.c

Merged revisions 213179 via svnmerge from

2009-08-19 22:39:42 +00:00

utils.c

Merged revisions 228620 via svnmerge from

2009-11-06 20:42:05 +00:00