Merged revisions 58894 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 14 Mar 2007 16:34:03 +0000 (16:34 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 14 Mar 2007 16:34:03 +0000 (16:34 +0000)
commit2ea01c893ca1147cd1c722d3c330c690b3b3350f
tree8c910e4189c294575034e49af73f20bd03a9b2de
parent4e8f9782879168ab01dd95d74633a2d7f8eebae1
Merged revisions 58894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58894 | russell | 2007-03-14 11:33:01 -0500 (Wed, 14 Mar 2007) | 8 lines

By default, don't attempt to do any CallerID handling at all with SLA because
it is known to not work properly in some situations.  However, add an option to
enable it for those that would like to use it anyway.

The short story behind this is that to properly handle CallerID with SLA, we
need the ability to change the CallerID on an existing call, and we are not
ready to handle that.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c
configs/sla.conf.sample