[svn-commits] jrose: branch 10 r330492 - /branches/10/

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Aug  1 16:10:35 2011
New Revision: 330492

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330492
Log:
Blocked revisions 330491 via svnmerge

................
  r330491 | jrose | 2011-08-01 16:09:15 -0500 (Mon, 01 Aug 2011) | 18 lines
  
  Blocked revisions 330490 via svnmerge
  
  ........
    r330490 | jrose | 2011-08-01 16:08:10 -0500 (Mon, 01 Aug 2011) | 12 lines
    
    Asterisk 18103 - Fix reload crash caused by destroying default parking lot
    
    Default parking lot was being destroyed in reload and was not being rebuilt properly.
    This patch keeps features.c reload from destroying the default parking lot in 1.6.2.
    Bug was caused by a hasty backport which didn't test reload enough times to catch the
    problem.
    
    (Closes Issue ASTERISK-18103)
    Reported by: 808blogger
    
    Review: https://reviewboard.asterisk.org/r/1337/
  ........
................

Modified:
    branches/10/   (props changed)

Propchange: branches/10/
------------------------------------------------------------------------------
--- branch-1.8-blocked (original)
+++ branch-1.8-blocked Mon Aug  1 16:10:35 2011
@@ -1,1 +1,1 @@
-/branches/1.8:299531,313436,317858,317861,321335,321753,322585,323730,328446,329782
+/branches/1.8:299531,313436,317858,317861,321335,321753,322585,323730,328446,329782,330491