[asterisk-commits] kmoore: branch kmoore/stasis-bridge_events r384940 - /team/kmoore/stasis-brid...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Apr  8 10:31:28 2013
New Revision: 384940

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384940
Log:
Multiple revisions 384761,384830,384858,384890,384917

........
  r384761 | root | 2013-04-04 13:17:21 -0500 (Thu, 04 Apr 2013) | 5 lines
  
  Separate some event struct definitions from instantiation.
  ........
  
  Merged revisions 384760 from file:///srv/subversion/repos/asterisk/trunk
........
  r384830 | root | 2013-04-05 16:17:20 -0500 (Fri, 05 Apr 2013) | 32 lines
  
  Fix For Not Overriding The Default Settings In chan_sip
  
  The initial report was that the "nat" setting in the [general] section was not
  having any effect in overriding the default setting.  Upon confirming that this
  was happening and looking into what was causing this, it was discovered that
  other default settings would not be overriden as well.
  
  This patch works similar to what occurs in build_peer().  We create a temporary
  ast_flags structure and using a mask, we override the default settings with
  whatever is set in the [general] section.
  
  In the bug report, the reporter who helped to test this patch noted that the
  directmedia settings were being overriden properly as well as the nat settings.
  
  This issue is also present in Asterisk 1.8 and a separate patch will be applied
  to it.
  
  (issue ASTERISK-21225)
  Reported by: Alexandre Vezina
  Tested by: Alexandre Vezina, Michael L. Young
  Patches:
    asterisk-21225-handle-options-default-prob_v4.diff
  						Michael L. Young (license 5026)
  
  Review: https://reviewboard.asterisk.org/r/2385/
  ........
  
  Merged revisions 384827 from http://svn.asterisk.org/svn/asterisk/branches/11
  ........
  
  Merged revisions 384828 from file:///srv/subversion/repos/asterisk/trunk
........
  r384858 | root | 2013-04-06 11:17:51 -0500 (Sat, 06 Apr 2013) | 7 lines
  
  Add a res_sorcery_astdb module which uses the astdb to persist objects.
  
  Review: https://reviewboard.asterisk.org/r/2420/
  ........
  
  Merged revisions 384857 from file:///srv/subversion/repos/asterisk/trunk
........
  r384890 | root | 2013-04-08 09:17:26 -0500 (Mon, 08 Apr 2013) | 29 lines
  
  Stasis application WebSocket support
  
  This is the API that binds the Stasis dialplan application to external
  Stasis applications. It also adds the beginnings of WebSocket
  application support.
  
  This module registers a dialplan function named Stasis, which is used
  to put a channel into the named Stasis app. As a channel enters and
  leaves the Stasis diaplan applcation, the Stasis app receives a
  'stasis-start' and 'stasis-end' events.
  
  Stasis apps register themselves using the stasis_app_register and
  stasis_app_unregister functions. Messages are sent to an appliction
  using stasis_app_send.
  
  Finally, Stasis apps control channels through the use of the
  stasis_app_control object, and the family of stasis_app_control_*
  functions.
  
  Other changes along for the ride are:
   * An ast_frame_dtor function that's RAII_VAR safe
   * Some common JSON encoders for name/number, timeval, and
     context/extension/priority
  
  Review: https://reviewboard.asterisk.org/r/2361/
  ........
  
  Merged revisions 384879 from file:///srv/subversion/repos/asterisk/trunk
........
  r384917 | root | 2013-04-08 10:17:21 -0500 (Mon, 08 Apr 2013) | 1 line
  
  automerge cancel
........

Merged revisions 384761,384830,384858,384890,384917 from http://svn.asterisk.org/svn/asterisk/team/group/bridge_construction

Modified:
    team/kmoore/stasis-bridge_events/   (props changed)

Propchange: team/kmoore/stasis-bridge_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr  8 10:31:28 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-384746
+/team/group/bridge_construction:1-384939