Merged revisions 289340 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 29 Sep 2010 21:19:46 +0000 (21:19 +0000)
committerJason Parker <jparker@digium.com>
Wed, 29 Sep 2010 21:19:46 +0000 (21:19 +0000)
commitce6abd6bf734a7e0792c99b393aa40964357541d
treebdeeda68b33ce26ea7508f61b417ea56ef97a89d
parent06c171fb1c212dd5d8b00a121e5427d23e830d39
Merged revisions 289340 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289340 | qwell | 2010-09-29 16:12:43 -0500 (Wed, 29 Sep 2010) | 22 lines

  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/trunk@289354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c
main/features.c