Reverting r403311. It's causing ARI tests to hang.
authorDavid M. Lee <dlee@digium.com>
Thu, 5 Dec 2013 22:10:20 +0000 (22:10 +0000)
committerDavid M. Lee <dlee@digium.com>
Thu, 5 Dec 2013 22:10:20 +0000 (22:10 +0000)
commit1212906351c3f4f5f759396c32b5e1dbabd403a4
tree285c7eea05e3b246fe9560fae93d9d79dd5f2ad0
parentfc70db3a810dae81e0ba0e09ecf11468bbef4d54
Reverting r403311. It's causing ARI tests to hang.
........

Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
57 files changed:
addons/chan_mobile.c
addons/chan_ooh323.c
apps/app_agent_pool.c
apps/app_confbridge.c
apps/app_dial.c
apps/app_disa.c
apps/app_meetme.c
apps/app_queue.c
apps/app_userevent.c
apps/app_voicemail.c
channels/chan_alsa.c
channels/chan_console.c
channels/chan_dahdi.c
channels/chan_gtalk.c
channels/chan_h323.c
channels/chan_iax2.c
channels/chan_jingle.c
channels/chan_mgcp.c
channels/chan_misdn.c
channels/chan_motif.c
channels/chan_nbs.c
channels/chan_oss.c
channels/chan_phone.c
channels/chan_pjsip.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_unistim.c
channels/chan_vpb.cc
channels/sig_analog.c
channels/sig_pri.c
funcs/func_timeout.c
include/asterisk/aoc.h
include/asterisk/channel.h
include/asterisk/channelstate.h
include/asterisk/stasis_bridges.h
include/asterisk/stasis_channels.h
main/bridge.c
main/bridge_channel.c
main/cel.c
main/channel.c
main/core_local.c
main/core_unreal.c
main/dial.c
main/endpoints.c
main/pbx.c
main/pickup.c
main/stasis_bridges.c
main/stasis_channels.c
pbx/pbx_realtime.c
res/parking/parking_bridge_features.c
res/parking/parking_manager.c
res/res_agi.c
res/res_pjsip_refer.c
res/res_stasis.c
tests/test_cdr.c
tests/test_cel.c
tests/test_stasis_channels.c