From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 10 Mar 2010 20:53:55 +0000 (+0000)
Subject: Blocked revisions 251679 via svnmerge
X-Git-Tag: 1.6.0.27-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbb0e54cf0670cbf4c47c7042365783b56c3812;p=thirdparty%2Fasterisk.git

Blocked revisions 251679 via svnmerge

........
  r251679 | jpeeler | 2010-03-10 14:51:23 -0600 (Wed, 10 Mar 2010) | 13 lines

  Fix ParkAndAnnounce not respecting parking options.

  The patch ensures that if a peer does not exist, parking settings are read from
  the channel. A unit test has been written to ensure proper operation for both
  standard parking and parking using masquerades.

  (closes issue #16592)
  Reported by: mwyres
  Patches:
        bug_16592.diff uploaded by snuffy (license 35)

  Review: https://reviewboard.asterisk.org/r/539/
........


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