]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 303284 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 21 Jan 2011 21:48:09 +0000 (21:48 +0000)
committerJason Parker <jparker@digium.com>
Fri, 21 Jan 2011 21:48:09 +0000 (21:48 +0000)
commit6d24696968b67b88c250c0b4a70fdbfbfcd7038f
tree735e744ec0333f89cd6c355548c048ba01ee6aba
parent01dfc39eb46abf3f79c147c45bb5034d399d719a
Merged revisions 303284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303284 | qwell | 2011-01-21 15:45:34 -0600 (Fri, 21 Jan 2011) | 8 lines

  Reset configuration before parsing users.conf.

  Some values configured in chan_dahdi.conf were able to leak in to users.conf
  configuration.  This was surprising users, and potentially setting non-sane
  "defaults".

  ASTNOW-125
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@303285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_dahdi.c