Merged revisions 377072,377077 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Mon, 3 Dec 2012 19:19:39 +0000 (19:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Mon, 3 Dec 2012 19:19:39 +0000 (19:19 +0000)
commit1ba058bb7d1eac129e95921b8600b5127e011055
treef4536d2ada367dfc7f13e6b36cd2cfbabcd5fce9
parent66fe664c007253748a23d48f4acc00a05a8d4b84
Merged revisions 377072,377077 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r377072 | rmudgett | 2012-12-03 12:45:18 -0600 (Mon, 03 Dec 2012) | 21 lines

  Cleanup CDR resources on exit.

  * Simplify do_reload() return handling since it never returned anything
  other than 0.

  (issue ASTERISK-20649)
  Reported by: Corey Farrell
  Patches:
        cdr-cleanup-1_8.patch (license #5909) patch uploaded by Corey Farrell
        cdr-cleanup-10-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
        Modified
  ........

  Merged revisions 377069 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 377070 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377071 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r377077 | rmudgett | 2012-12-03 13:17:24 -0600 (Mon, 03 Dec 2012) | 18 lines

  Cleanup CLI resources on exit and CLI command registration errors.

  (issue ASTERISK-20649)
  Reported by: Corey Farrell
  Patches:
        cli-leaks-1_8-10.patch (license #5909) patch uploaded by Corey Farrell
        cli-leaks-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
        Modified
  ........

  Merged revisions 377073 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 377074 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377075 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/cdr.c
main/cli.c