]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 289339 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 29 Sep 2010 21:12:43 +0000 (21:12 +0000)
committerJason Parker <jparker@digium.com>
Wed, 29 Sep 2010 21:12:43 +0000 (21:12 +0000)
commit86460af890dc22a58773333eda406c047d028eb5
tree42d7bd8b46407a77ea6c26a8ef705153530c4a39
parent88d6e7300a291708da31e58c58b18459fe6876d2
Merged revisions 289339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r289339 | qwell | 2010-09-29 16:03:47 -0500 (Wed, 29 Sep 2010) | 15 lines

  Merged revisions 289338 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r289338 | qwell | 2010-09-29 15:56:26 -0500 (Wed, 29 Sep 2010) | 8 lines

    Allow a manager originate to succeed on forwarded devices.

    The timeout to wait for an answer was being set to 0 when a device forwarded to another
    extension.  We don't always need the timeout set like this, so make it an optional
    parameter, and don't use it in this case.

    ABE-2544
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@289340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c
main/features.c