[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r335996 - /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu Sep 15 03:56:24 2011
New Revision: 335996

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335996
Log:
Merged revisions 335993 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r335993 | irroot | 2011-09-15 10:40:07 +0200 (Thu, 15 Sep 2011) | 24 lines
  
  Merged revisions 335991 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r335991 | irroot | 2011-09-15 10:29:12 +0200 (Thu, 15 Sep 2011) | 17 lines
    
    Merged revisions 335978 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r335978 | irroot | 2011-09-15 10:15:22 +0200 (Thu, 15 Sep 2011) | 11 lines
      
      lock the channel before calling ast_bridged_channel() to prevent a seg fault.
      
      AMI agents list called on shutdown causes a segfault, introducing proper locking
      will prevent this.
      
      (closes issue ASTERISK-18092)
      
      Reported by: agustina
      Patches: chan_agent.patch (License #5041) patch uploaded by irroot
    ........
  ................
................

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 15 03:56:24 2011
@@ -1,1 +1,1 @@
-/trunk:1-335927
+/trunk:1-335993