[asterisk-commits] mmichelson: branch mmichelson/queue_bugbug r396022 - in /team/mmichelson/queu...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Aug 1 14:25:21 CDT 2013
Author: mmichelson
Date: Thu Aug 1 14:25:09 2013
New Revision: 396022
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396022
Log:
Resolve conflict and reset automerge.
Added:
team/mmichelson/queue_bugbug/channels/chan_pjsip.c
- copied unchanged from r396010, trunk/channels/chan_pjsip.c
team/mmichelson/queue_bugbug/configs/pjsip.conf.sample
- copied unchanged from r396010, trunk/configs/pjsip.conf.sample
team/mmichelson/queue_bugbug/doc/snapshots.xslt
- copied unchanged from r396010, trunk/doc/snapshots.xslt
team/mmichelson/queue_bugbug/include/asterisk/ari.h
- copied unchanged from r396010, trunk/include/asterisk/ari.h
team/mmichelson/queue_bugbug/include/asterisk/bridge.h
- copied unchanged from r396010, trunk/include/asterisk/bridge.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_after.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_after.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_basic.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_basic.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_channel.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_channel.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_channel_internal.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_channel_internal.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_features.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_features.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_internal.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_internal.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_roles.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_roles.h
team/mmichelson/queue_bugbug/include/asterisk/bridge_technology.h
- copied unchanged from r396010, trunk/include/asterisk/bridge_technology.h
team/mmichelson/queue_bugbug/include/asterisk/res_pjsip.h
- copied unchanged from r396010, trunk/include/asterisk/res_pjsip.h
team/mmichelson/queue_bugbug/include/asterisk/res_pjsip_exten_state.h
- copied unchanged from r396010, trunk/include/asterisk/res_pjsip_exten_state.h
team/mmichelson/queue_bugbug/include/asterisk/res_pjsip_pubsub.h
- copied unchanged from r396010, trunk/include/asterisk/res_pjsip_pubsub.h
team/mmichelson/queue_bugbug/include/asterisk/res_pjsip_session.h
- copied unchanged from r396010, trunk/include/asterisk/res_pjsip_session.h
team/mmichelson/queue_bugbug/include/asterisk/stasis_bridges.h
- copied unchanged from r396010, trunk/include/asterisk/stasis_bridges.h
team/mmichelson/queue_bugbug/include/asterisk/stasis_cache_pattern.h
- copied unchanged from r396010, trunk/include/asterisk/stasis_cache_pattern.h
team/mmichelson/queue_bugbug/main/bridge.c
- copied unchanged from r396010, trunk/main/bridge.c
team/mmichelson/queue_bugbug/main/bridge_after.c
- copied unchanged from r396010, trunk/main/bridge_after.c
team/mmichelson/queue_bugbug/main/bridge_basic.c
- copied unchanged from r396010, trunk/main/bridge_basic.c
team/mmichelson/queue_bugbug/main/bridge_channel.c
- copied unchanged from r396010, trunk/main/bridge_channel.c
team/mmichelson/queue_bugbug/main/bridge_roles.c
- copied unchanged from r396010, trunk/main/bridge_roles.c
team/mmichelson/queue_bugbug/main/manager_bridges.c
- copied unchanged from r396010, trunk/main/manager_bridges.c
team/mmichelson/queue_bugbug/main/stasis_bridges.c
- copied unchanged from r396010, trunk/main/stasis_bridges.c
team/mmichelson/queue_bugbug/main/stasis_cache_pattern.c
- copied unchanged from r396010, trunk/main/stasis_cache_pattern.c
team/mmichelson/queue_bugbug/main/stasis_wait.c
- copied unchanged from r396010, trunk/main/stasis_wait.c
team/mmichelson/queue_bugbug/res/ari/ (props changed)
- copied from r396010, trunk/res/ari/
team/mmichelson/queue_bugbug/res/ari.make
- copied unchanged from r396010, trunk/res/ari.make
team/mmichelson/queue_bugbug/res/ari/ari_model_validators.c
- copied unchanged from r396010, trunk/res/ari/ari_model_validators.c
team/mmichelson/queue_bugbug/res/ari/ari_model_validators.h
- copied unchanged from r396010, trunk/res/ari/ari_model_validators.h
team/mmichelson/queue_bugbug/res/ari/ari_websockets.c
- copied unchanged from r396010, trunk/res/ari/ari_websockets.c
team/mmichelson/queue_bugbug/res/ari/cli.c
- copied unchanged from r396010, trunk/res/ari/cli.c
team/mmichelson/queue_bugbug/res/ari/config.c
- copied unchanged from r396010, trunk/res/ari/config.c
team/mmichelson/queue_bugbug/res/ari/internal.h
- copied unchanged from r396010, trunk/res/ari/internal.h
team/mmichelson/queue_bugbug/res/ari/resource_asterisk.c
- copied unchanged from r396010, trunk/res/ari/resource_asterisk.c
team/mmichelson/queue_bugbug/res/ari/resource_asterisk.h
- copied unchanged from r396010, trunk/res/ari/resource_asterisk.h
team/mmichelson/queue_bugbug/res/ari/resource_bridges.c
- copied unchanged from r396010, trunk/res/ari/resource_bridges.c
team/mmichelson/queue_bugbug/res/ari/resource_bridges.h
- copied unchanged from r396010, trunk/res/ari/resource_bridges.h
team/mmichelson/queue_bugbug/res/ari/resource_channels.c
- copied unchanged from r396010, trunk/res/ari/resource_channels.c
team/mmichelson/queue_bugbug/res/ari/resource_channels.h
- copied unchanged from r396010, trunk/res/ari/resource_channels.h
team/mmichelson/queue_bugbug/res/ari/resource_endpoints.c
- copied unchanged from r396010, trunk/res/ari/resource_endpoints.c
team/mmichelson/queue_bugbug/res/ari/resource_endpoints.h
- copied unchanged from r396010, trunk/res/ari/resource_endpoints.h
team/mmichelson/queue_bugbug/res/ari/resource_events.c
- copied unchanged from r396010, trunk/res/ari/resource_events.c
team/mmichelson/queue_bugbug/res/ari/resource_events.h
- copied unchanged from r396010, trunk/res/ari/resource_events.h
team/mmichelson/queue_bugbug/res/ari/resource_playback.c
- copied unchanged from r396010, trunk/res/ari/resource_playback.c
team/mmichelson/queue_bugbug/res/ari/resource_playback.h
- copied unchanged from r396010, trunk/res/ari/resource_playback.h
team/mmichelson/queue_bugbug/res/ari/resource_recordings.c
- copied unchanged from r396010, trunk/res/ari/resource_recordings.c
team/mmichelson/queue_bugbug/res/ari/resource_recordings.h
- copied unchanged from r396010, trunk/res/ari/resource_recordings.h
team/mmichelson/queue_bugbug/res/ari/resource_sounds.c
- copied unchanged from r396010, trunk/res/ari/resource_sounds.c
team/mmichelson/queue_bugbug/res/ari/resource_sounds.h
- copied unchanged from r396010, trunk/res/ari/resource_sounds.h
team/mmichelson/queue_bugbug/res/res_ari.c
- copied unchanged from r396010, trunk/res/res_ari.c
team/mmichelson/queue_bugbug/res/res_ari.exports.in
- copied unchanged from r396010, trunk/res/res_ari.exports.in
team/mmichelson/queue_bugbug/res/res_ari_asterisk.c
- copied unchanged from r396010, trunk/res/res_ari_asterisk.c
team/mmichelson/queue_bugbug/res/res_ari_bridges.c
- copied unchanged from r396010, trunk/res/res_ari_bridges.c
team/mmichelson/queue_bugbug/res/res_ari_channels.c
- copied unchanged from r396010, trunk/res/res_ari_channels.c
team/mmichelson/queue_bugbug/res/res_ari_endpoints.c
- copied unchanged from r396010, trunk/res/res_ari_endpoints.c
team/mmichelson/queue_bugbug/res/res_ari_events.c
- copied unchanged from r396010, trunk/res/res_ari_events.c
team/mmichelson/queue_bugbug/res/res_ari_playback.c
- copied unchanged from r396010, trunk/res/res_ari_playback.c
team/mmichelson/queue_bugbug/res/res_ari_recordings.c
- copied unchanged from r396010, trunk/res/res_ari_recordings.c
team/mmichelson/queue_bugbug/res/res_ari_sounds.c
- copied unchanged from r396010, trunk/res/res_ari_sounds.c
team/mmichelson/queue_bugbug/res/res_pjsip/ (props changed)
- copied from r396010, trunk/res/res_pjsip/
team/mmichelson/queue_bugbug/res/res_pjsip.c
- copied unchanged from r396010, trunk/res/res_pjsip.c
team/mmichelson/queue_bugbug/res/res_pjsip.exports.in
- copied unchanged from r396010, trunk/res/res_pjsip.exports.in
team/mmichelson/queue_bugbug/res/res_pjsip/config_auth.c
- copied unchanged from r396010, trunk/res/res_pjsip/config_auth.c
team/mmichelson/queue_bugbug/res/res_pjsip/config_domain_aliases.c
- copied unchanged from r396010, trunk/res/res_pjsip/config_domain_aliases.c
team/mmichelson/queue_bugbug/res/res_pjsip/config_global.c
- copied unchanged from r396010, trunk/res/res_pjsip/config_global.c
team/mmichelson/queue_bugbug/res/res_pjsip/config_security.c
- copied unchanged from r396010, trunk/res/res_pjsip/config_security.c
team/mmichelson/queue_bugbug/res/res_pjsip/config_system.c
- copied unchanged from r396010, trunk/res/res_pjsip/config_system.c
team/mmichelson/queue_bugbug/res/res_pjsip/config_transport.c
- copied unchanged from r396010, trunk/res/res_pjsip/config_transport.c
team/mmichelson/queue_bugbug/res/res_pjsip/include/
- copied from r396010, trunk/res/res_pjsip/include/
team/mmichelson/queue_bugbug/res/res_pjsip/include/res_pjsip_private.h
- copied unchanged from r396010, trunk/res/res_pjsip/include/res_pjsip_private.h
team/mmichelson/queue_bugbug/res/res_pjsip/location.c
- copied unchanged from r396010, trunk/res/res_pjsip/location.c
team/mmichelson/queue_bugbug/res/res_pjsip/pjsip_configuration.c
- copied unchanged from r396010, trunk/res/res_pjsip/pjsip_configuration.c
team/mmichelson/queue_bugbug/res/res_pjsip/pjsip_distributor.c
- copied unchanged from r396010, trunk/res/res_pjsip/pjsip_distributor.c
team/mmichelson/queue_bugbug/res/res_pjsip/pjsip_global_headers.c
- copied unchanged from r396010, trunk/res/res_pjsip/pjsip_global_headers.c
team/mmichelson/queue_bugbug/res/res_pjsip/pjsip_options.c
- copied unchanged from r396010, trunk/res/res_pjsip/pjsip_options.c
team/mmichelson/queue_bugbug/res/res_pjsip/pjsip_outbound_auth.c
- copied unchanged from r396010, trunk/res/res_pjsip/pjsip_outbound_auth.c
team/mmichelson/queue_bugbug/res/res_pjsip/security_events.c
- copied unchanged from r396010, trunk/res/res_pjsip/security_events.c
team/mmichelson/queue_bugbug/res/res_pjsip_acl.c
- copied unchanged from r396010, trunk/res/res_pjsip_acl.c
team/mmichelson/queue_bugbug/res/res_pjsip_authenticator_digest.c
- copied unchanged from r396010, trunk/res/res_pjsip_authenticator_digest.c
team/mmichelson/queue_bugbug/res/res_pjsip_caller_id.c
- copied unchanged from r396010, trunk/res/res_pjsip_caller_id.c
team/mmichelson/queue_bugbug/res/res_pjsip_diversion.c
- copied unchanged from r396010, trunk/res/res_pjsip_diversion.c
team/mmichelson/queue_bugbug/res/res_pjsip_dtmf_info.c
- copied unchanged from r396010, trunk/res/res_pjsip_dtmf_info.c
team/mmichelson/queue_bugbug/res/res_pjsip_endpoint_identifier_anonymous.c
- copied unchanged from r396010, trunk/res/res_pjsip_endpoint_identifier_anonymous.c
team/mmichelson/queue_bugbug/res/res_pjsip_endpoint_identifier_ip.c
- copied unchanged from r396010, trunk/res/res_pjsip_endpoint_identifier_ip.c
team/mmichelson/queue_bugbug/res/res_pjsip_endpoint_identifier_user.c
- copied unchanged from r396010, trunk/res/res_pjsip_endpoint_identifier_user.c
team/mmichelson/queue_bugbug/res/res_pjsip_exten_state.c
- copied unchanged from r396010, trunk/res/res_pjsip_exten_state.c
team/mmichelson/queue_bugbug/res/res_pjsip_exten_state.exports.in
- copied unchanged from r396010, trunk/res/res_pjsip_exten_state.exports.in
team/mmichelson/queue_bugbug/res/res_pjsip_logger.c
- copied unchanged from r396010, trunk/res/res_pjsip_logger.c
team/mmichelson/queue_bugbug/res/res_pjsip_messaging.c
- copied unchanged from r396010, trunk/res/res_pjsip_messaging.c
team/mmichelson/queue_bugbug/res/res_pjsip_mwi.c
- copied unchanged from r396010, trunk/res/res_pjsip_mwi.c
team/mmichelson/queue_bugbug/res/res_pjsip_nat.c
- copied unchanged from r396010, trunk/res/res_pjsip_nat.c
team/mmichelson/queue_bugbug/res/res_pjsip_notify.c
- copied unchanged from r396010, trunk/res/res_pjsip_notify.c
team/mmichelson/queue_bugbug/res/res_pjsip_one_touch_record_info.c
- copied unchanged from r396010, trunk/res/res_pjsip_one_touch_record_info.c
team/mmichelson/queue_bugbug/res/res_pjsip_outbound_authenticator_digest.c
- copied unchanged from r396010, trunk/res/res_pjsip_outbound_authenticator_digest.c
team/mmichelson/queue_bugbug/res/res_pjsip_outbound_registration.c
- copied unchanged from r396010, trunk/res/res_pjsip_outbound_registration.c
team/mmichelson/queue_bugbug/res/res_pjsip_pidf.c
- copied unchanged from r396010, trunk/res/res_pjsip_pidf.c
team/mmichelson/queue_bugbug/res/res_pjsip_pubsub.c
- copied unchanged from r396010, trunk/res/res_pjsip_pubsub.c
team/mmichelson/queue_bugbug/res/res_pjsip_pubsub.exports.in
- copied unchanged from r396010, trunk/res/res_pjsip_pubsub.exports.in
team/mmichelson/queue_bugbug/res/res_pjsip_refer.c
- copied unchanged from r396010, trunk/res/res_pjsip_refer.c
team/mmichelson/queue_bugbug/res/res_pjsip_registrar.c
- copied unchanged from r396010, trunk/res/res_pjsip_registrar.c
team/mmichelson/queue_bugbug/res/res_pjsip_registrar_expire.c
- copied unchanged from r396010, trunk/res/res_pjsip_registrar_expire.c
team/mmichelson/queue_bugbug/res/res_pjsip_rfc3326.c
- copied unchanged from r396010, trunk/res/res_pjsip_rfc3326.c
team/mmichelson/queue_bugbug/res/res_pjsip_sdp_rtp.c
- copied unchanged from r396010, trunk/res/res_pjsip_sdp_rtp.c
team/mmichelson/queue_bugbug/res/res_pjsip_session.c
- copied unchanged from r396010, trunk/res/res_pjsip_session.c
team/mmichelson/queue_bugbug/res/res_pjsip_session.exports.in
- copied unchanged from r396010, trunk/res/res_pjsip_session.exports.in
team/mmichelson/queue_bugbug/res/res_pjsip_t38.c
- copied unchanged from r396010, trunk/res/res_pjsip_t38.c
team/mmichelson/queue_bugbug/res/res_pjsip_transport_websocket.c
- copied unchanged from r396010, trunk/res/res_pjsip_transport_websocket.c
team/mmichelson/queue_bugbug/rest-api-templates/ari.make.mustache
- copied unchanged from r396010, trunk/rest-api-templates/ari.make.mustache
team/mmichelson/queue_bugbug/rest-api-templates/ari_resource.c.mustache
- copied unchanged from r396010, trunk/rest-api-templates/ari_resource.c.mustache
team/mmichelson/queue_bugbug/rest-api-templates/ari_resource.h.mustache
- copied unchanged from r396010, trunk/rest-api-templates/ari_resource.h.mustache
team/mmichelson/queue_bugbug/rest-api-templates/res_ari_resource.c.mustache
- copied unchanged from r396010, trunk/rest-api-templates/res_ari_resource.c.mustache
team/mmichelson/queue_bugbug/tests/test_ari.c
- copied unchanged from r396010, trunk/tests/test_ari.c
Removed:
team/mmichelson/queue_bugbug/channels/chan_gulp.c
team/mmichelson/queue_bugbug/configs/res_sip.conf.sample
team/mmichelson/queue_bugbug/include/asterisk/bridging.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_basic.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_channel.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_channel_internal.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_features.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_internal.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_roles.h
team/mmichelson/queue_bugbug/include/asterisk/bridging_technology.h
team/mmichelson/queue_bugbug/include/asterisk/res_sip.h
team/mmichelson/queue_bugbug/include/asterisk/res_sip_exten_state.h
team/mmichelson/queue_bugbug/include/asterisk/res_sip_pubsub.h
team/mmichelson/queue_bugbug/include/asterisk/res_sip_session.h
team/mmichelson/queue_bugbug/include/asterisk/stasis_bridging.h
team/mmichelson/queue_bugbug/include/asterisk/stasis_http.h
team/mmichelson/queue_bugbug/main/bridging.c
team/mmichelson/queue_bugbug/main/bridging_basic.c
team/mmichelson/queue_bugbug/main/bridging_channel.c
team/mmichelson/queue_bugbug/main/bridging_roles.c
team/mmichelson/queue_bugbug/main/manager_bridging.c
team/mmichelson/queue_bugbug/main/stasis_bridging.c
team/mmichelson/queue_bugbug/res/res_sip/
team/mmichelson/queue_bugbug/res/res_sip.c
team/mmichelson/queue_bugbug/res/res_sip.exports.in
team/mmichelson/queue_bugbug/res/res_sip_acl.c
team/mmichelson/queue_bugbug/res/res_sip_authenticator_digest.c
team/mmichelson/queue_bugbug/res/res_sip_caller_id.c
team/mmichelson/queue_bugbug/res/res_sip_diversion.c
team/mmichelson/queue_bugbug/res/res_sip_dtmf_info.c
team/mmichelson/queue_bugbug/res/res_sip_endpoint_identifier_anonymous.c
team/mmichelson/queue_bugbug/res/res_sip_endpoint_identifier_constant.c
team/mmichelson/queue_bugbug/res/res_sip_endpoint_identifier_ip.c
team/mmichelson/queue_bugbug/res/res_sip_endpoint_identifier_user.c
team/mmichelson/queue_bugbug/res/res_sip_exten_state.c
team/mmichelson/queue_bugbug/res/res_sip_exten_state.exports.in
team/mmichelson/queue_bugbug/res/res_sip_logger.c
team/mmichelson/queue_bugbug/res/res_sip_messaging.c
team/mmichelson/queue_bugbug/res/res_sip_mwi.c
team/mmichelson/queue_bugbug/res/res_sip_nat.c
team/mmichelson/queue_bugbug/res/res_sip_notify.c
team/mmichelson/queue_bugbug/res/res_sip_one_touch_record_info.c
team/mmichelson/queue_bugbug/res/res_sip_outbound_authenticator_digest.c
team/mmichelson/queue_bugbug/res/res_sip_outbound_registration.c
team/mmichelson/queue_bugbug/res/res_sip_pidf.c
team/mmichelson/queue_bugbug/res/res_sip_pubsub.c
team/mmichelson/queue_bugbug/res/res_sip_pubsub.exports.in
team/mmichelson/queue_bugbug/res/res_sip_refer.c
team/mmichelson/queue_bugbug/res/res_sip_registrar.c
team/mmichelson/queue_bugbug/res/res_sip_registrar_expire.c
team/mmichelson/queue_bugbug/res/res_sip_rfc3326.c
team/mmichelson/queue_bugbug/res/res_sip_sdp_rtp.c
team/mmichelson/queue_bugbug/res/res_sip_session.c
team/mmichelson/queue_bugbug/res/res_sip_session.exports.in
team/mmichelson/queue_bugbug/res/res_sip_transport_websocket.c
team/mmichelson/queue_bugbug/res/res_stasis_http.c
team/mmichelson/queue_bugbug/res/res_stasis_http.exports.in
team/mmichelson/queue_bugbug/res/res_stasis_http_asterisk.c
team/mmichelson/queue_bugbug/res/res_stasis_http_bridges.c
team/mmichelson/queue_bugbug/res/res_stasis_http_channels.c
team/mmichelson/queue_bugbug/res/res_stasis_http_endpoints.c
team/mmichelson/queue_bugbug/res/res_stasis_http_events.c
team/mmichelson/queue_bugbug/res/res_stasis_http_playback.c
team/mmichelson/queue_bugbug/res/res_stasis_http_recordings.c
team/mmichelson/queue_bugbug/res/res_stasis_http_sounds.c
team/mmichelson/queue_bugbug/res/stasis_http/
team/mmichelson/queue_bugbug/res/stasis_http.make
team/mmichelson/queue_bugbug/rest-api-templates/res_stasis_http_resource.c.mustache
team/mmichelson/queue_bugbug/rest-api-templates/stasis_http.make.mustache
team/mmichelson/queue_bugbug/rest-api-templates/stasis_http_resource.c.mustache
team/mmichelson/queue_bugbug/rest-api-templates/stasis_http_resource.h.mustache
team/mmichelson/queue_bugbug/tests/test_stasis_http.c
Modified:
team/mmichelson/queue_bugbug/ (props changed)
team/mmichelson/queue_bugbug/CHANGES
team/mmichelson/queue_bugbug/Makefile
team/mmichelson/queue_bugbug/UPGRADE.txt
team/mmichelson/queue_bugbug/apps/app_agent_pool.c
team/mmichelson/queue_bugbug/apps/app_bridgewait.c
team/mmichelson/queue_bugbug/apps/app_confbridge.c
team/mmichelson/queue_bugbug/apps/app_dial.c
team/mmichelson/queue_bugbug/apps/app_dumpchan.c
team/mmichelson/queue_bugbug/apps/app_meetme.c
team/mmichelson/queue_bugbug/apps/app_minivm.c
team/mmichelson/queue_bugbug/apps/app_queue.c
team/mmichelson/queue_bugbug/apps/app_stack.c
team/mmichelson/queue_bugbug/apps/app_voicemail.c
team/mmichelson/queue_bugbug/apps/confbridge/conf_chan_announce.c
team/mmichelson/queue_bugbug/apps/confbridge/conf_chan_record.c
team/mmichelson/queue_bugbug/apps/confbridge/conf_config_parser.c
team/mmichelson/queue_bugbug/apps/confbridge/confbridge_manager.c
team/mmichelson/queue_bugbug/apps/confbridge/include/confbridge.h
team/mmichelson/queue_bugbug/bridges/bridge_builtin_features.c
team/mmichelson/queue_bugbug/bridges/bridge_builtin_interval_features.c
team/mmichelson/queue_bugbug/bridges/bridge_holding.c
team/mmichelson/queue_bugbug/bridges/bridge_native_rtp.c
team/mmichelson/queue_bugbug/bridges/bridge_simple.c
team/mmichelson/queue_bugbug/bridges/bridge_softmix.c
team/mmichelson/queue_bugbug/channels/chan_bridge_media.c
team/mmichelson/queue_bugbug/channels/chan_dahdi.c
team/mmichelson/queue_bugbug/channels/chan_iax2.c
team/mmichelson/queue_bugbug/channels/chan_mgcp.c
team/mmichelson/queue_bugbug/channels/chan_misdn.c
team/mmichelson/queue_bugbug/channels/chan_sip.c
team/mmichelson/queue_bugbug/channels/chan_skinny.c
team/mmichelson/queue_bugbug/channels/chan_unistim.c
team/mmichelson/queue_bugbug/channels/dahdi/bridge_native_dahdi.c
team/mmichelson/queue_bugbug/channels/sig_analog.c
team/mmichelson/queue_bugbug/channels/sig_pri.c
team/mmichelson/queue_bugbug/configs/ari.conf.sample
team/mmichelson/queue_bugbug/configure
team/mmichelson/queue_bugbug/configure.ac
team/mmichelson/queue_bugbug/contrib/scripts/install_prereq
team/mmichelson/queue_bugbug/doc/appdocsxml.dtd
team/mmichelson/queue_bugbug/funcs/func_channel.c
team/mmichelson/queue_bugbug/funcs/func_global.c
team/mmichelson/queue_bugbug/include/asterisk/app.h
team/mmichelson/queue_bugbug/include/asterisk/autoconfig.h.in
team/mmichelson/queue_bugbug/include/asterisk/channel.h
team/mmichelson/queue_bugbug/include/asterisk/channel_internal.h
team/mmichelson/queue_bugbug/include/asterisk/core_unreal.h
team/mmichelson/queue_bugbug/include/asterisk/devicestate.h
team/mmichelson/queue_bugbug/include/asterisk/doxygen/architecture.h
team/mmichelson/queue_bugbug/include/asterisk/features.h
team/mmichelson/queue_bugbug/include/asterisk/mixmonitor.h (props changed)
team/mmichelson/queue_bugbug/include/asterisk/parking.h
team/mmichelson/queue_bugbug/include/asterisk/presencestate.h
team/mmichelson/queue_bugbug/include/asterisk/stasis.h
team/mmichelson/queue_bugbug/include/asterisk/stasis_channels.h
team/mmichelson/queue_bugbug/include/asterisk/stasis_endpoints.h
team/mmichelson/queue_bugbug/main/Makefile
team/mmichelson/queue_bugbug/main/abstract_jb.c
team/mmichelson/queue_bugbug/main/aoc.c
team/mmichelson/queue_bugbug/main/app.c
team/mmichelson/queue_bugbug/main/cdr.c
team/mmichelson/queue_bugbug/main/cel.c
team/mmichelson/queue_bugbug/main/channel.c
team/mmichelson/queue_bugbug/main/channel_internal_api.c
team/mmichelson/queue_bugbug/main/cli.c
team/mmichelson/queue_bugbug/main/core_local.c
team/mmichelson/queue_bugbug/main/core_unreal.c
team/mmichelson/queue_bugbug/main/devicestate.c
team/mmichelson/queue_bugbug/main/endpoints.c
team/mmichelson/queue_bugbug/main/features.c
team/mmichelson/queue_bugbug/main/loader.c
team/mmichelson/queue_bugbug/main/manager.c
team/mmichelson/queue_bugbug/main/manager_channels.c
team/mmichelson/queue_bugbug/main/manager_endpoints.c
team/mmichelson/queue_bugbug/main/manager_mwi.c
team/mmichelson/queue_bugbug/main/mixmonitor.c (contents, props changed)
team/mmichelson/queue_bugbug/main/parking.c
team/mmichelson/queue_bugbug/main/pbx.c
team/mmichelson/queue_bugbug/main/presencestate.c
team/mmichelson/queue_bugbug/main/rtp_engine.c
team/mmichelson/queue_bugbug/main/stasis.c
team/mmichelson/queue_bugbug/main/stasis_cache.c
team/mmichelson/queue_bugbug/main/stasis_channels.c
team/mmichelson/queue_bugbug/main/stasis_config.c
team/mmichelson/queue_bugbug/main/stasis_endpoints.c
team/mmichelson/queue_bugbug/main/xml.c
team/mmichelson/queue_bugbug/makeopts.in
team/mmichelson/queue_bugbug/res/Makefile
team/mmichelson/queue_bugbug/res/parking/parking_applications.c
team/mmichelson/queue_bugbug/res/parking/parking_bridge.c
team/mmichelson/queue_bugbug/res/parking/parking_bridge_features.c
team/mmichelson/queue_bugbug/res/parking/parking_controller.c
team/mmichelson/queue_bugbug/res/parking/parking_devicestate.c (props changed)
team/mmichelson/queue_bugbug/res/parking/parking_manager.c
team/mmichelson/queue_bugbug/res/parking/res_parking.h
team/mmichelson/queue_bugbug/res/res_agi.c
team/mmichelson/queue_bugbug/res/res_ari_model.c
team/mmichelson/queue_bugbug/res/res_ari_model.exports.in
team/mmichelson/queue_bugbug/res/res_chan_stats.c
team/mmichelson/queue_bugbug/res/res_jabber.c
team/mmichelson/queue_bugbug/res/res_pktccops.c
team/mmichelson/queue_bugbug/res/res_stasis.c
team/mmichelson/queue_bugbug/res/res_stasis_bridge_add.c
team/mmichelson/queue_bugbug/res/res_statsd.c
team/mmichelson/queue_bugbug/res/res_xmpp.c
team/mmichelson/queue_bugbug/res/stasis/app.c
team/mmichelson/queue_bugbug/res/stasis/control.c
team/mmichelson/queue_bugbug/rest-api-templates/ari_model_validators.c.mustache
team/mmichelson/queue_bugbug/rest-api-templates/ari_model_validators.h.mustache
team/mmichelson/queue_bugbug/rest-api-templates/make_ari_stubs.py
team/mmichelson/queue_bugbug/rest-api-templates/rest_handler.mustache
team/mmichelson/queue_bugbug/tests/test_ari_model.c
team/mmichelson/queue_bugbug/tests/test_cdr.c
team/mmichelson/queue_bugbug/tests/test_cel.c
team/mmichelson/queue_bugbug/tests/test_devicestate.c
team/mmichelson/queue_bugbug/tests/test_stasis.c
team/mmichelson/queue_bugbug/tests/test_stasis_endpoints.c
team/mmichelson/queue_bugbug/utils/astman.c
Propchange: team/mmichelson/queue_bugbug/
------------------------------------------------------------------------------
automerge = *
Propchange: team/mmichelson/queue_bugbug/
------------------------------------------------------------------------------
automerge-email = mmichelson at digium.com
Propchange: team/mmichelson/queue_bugbug/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 1 14:25:09 2013
@@ -1,1 +1,1 @@
-/trunk:1-395358
+/trunk:1-396019
Modified: team/mmichelson/queue_bugbug/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/queue_bugbug/CHANGES?view=diff&rev=396022&r1=396021&r2=396022
==============================================================================
--- team/mmichelson/queue_bugbug/CHANGES (original)
+++ team/mmichelson/queue_bugbug/CHANGES Thu Aug 1 14:25:09 2013
@@ -106,6 +106,12 @@
for running an application on a bridge or channel, or "LINK" for linking
two bridges together with local channels.
+ * Queues now support a hint for member paused state. The hint uses the form
+ 'Queue:{queue_name}_pause_{member_name}', where {queue_name} and {member_name}
+ are the name of the queue and the name of the member to subscribe to,
+ respectively. For example: exten => 8501,hint,Queue:sales_pause_mark.
+ Members will show as In Use when paused.
+
ResetCDR
------------------
* The 'e' option has been deprecated. Use the CDR_PROP function to re-enable
@@ -123,6 +129,13 @@
* UserEvent will now handle duplicate keys by overwriting the previous value
assigned to the key. UserEvent invocations will also be distributed to any
interested res_stasis applications.
+
+
+Build System
+------------------
+ * Asterisk now optionally uses libxslt to improve XML documentation generation
+ and maintainability. If libxslt is not available on the system, some XML
+ documentation will be incomplete.
Core
@@ -312,6 +325,10 @@
* The manager event AsyncAGI has been split into AsyncAGIStart, AsyncAGIExec,
and AsyncAGIEnd.
+
+ * The CONTROL STREAM FILE command now accepts an offsetms parameter. This
+ will start the playback of the audio at the position specified. It will
+ also return the final position of the file in 'endpos'.
CDR (Call Detail Records)
------------------
Modified: team/mmichelson/queue_bugbug/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/queue_bugbug/Makefile?view=diff&rev=396022&r1=396021&r2=396022
==============================================================================
--- team/mmichelson/queue_bugbug/Makefile (original)
+++ team/mmichelson/queue_bugbug/Makefile Thu Aug 1 14:25:09 2013
@@ -444,6 +444,7 @@
$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
done
$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
+ $(INSTALL) -m 644 doc/snapshots.xslt "$(DESTDIR)$(ASTDATADIR)/static-http";
if [ -d doc/tex/asterisk ] ; then \
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
for n in doc/tex/asterisk/* ; do \
@@ -466,6 +467,7 @@
@printf "Building Documentation For: "
@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+ @echo "<?xml-stylesheet type=\"text/xsl\" href=\"snapshots.xslt\"?>" > $@
@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
@for x in $(MOD_SUBDIRS); do \
printf "$$x " ; \
@@ -489,6 +491,7 @@
@printf "Building Documentation For: "
@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+ @echo "<?xml-stylesheet type=\"text/xsl\" href=\"snapshots.xslt\"?>" > $@
@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
@for x in $(MOD_SUBDIRS); do \
printf "$$x " ; \
@@ -571,6 +574,7 @@
fi
$(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation"
+ $(INSTALL) -m 644 doc/snapshots.xslt "$(DESTDIR)$(ASTDATADIR)/documentation"
$(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation"
$(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
$(INSTALL) -m 644 contrib/scripts/astgenkey.8 "$(DESTDIR)$(ASTMANDIR)/man8"
Modified: team/mmichelson/queue_bugbug/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/queue_bugbug/UPGRADE.txt?view=diff&rev=396022&r1=396021&r2=396022
==============================================================================
--- team/mmichelson/queue_bugbug/UPGRADE.txt (original)
+++ team/mmichelson/queue_bugbug/UPGRADE.txt Thu Aug 1 14:25:09 2013
@@ -96,6 +96,11 @@
- The Uniqueid field for a channel is now a stable identifier, and will not
change due to transfers, parking, etc.
+Build System:
+ - Asterisk now optionally uses libxslt to improve XML documentation generation
+ and maintainability. If libxslt is not available on the system, some XML
+ documentation will be incomplete.
+
Core:
- The following channel variables have changed behavior which is described in
the CHANGES file: TRANSFER_CONTEXT, BRIDGEPEER, BRIDGEPVTCALLID,
Modified: team/mmichelson/queue_bugbug/apps/app_agent_pool.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/queue_bugbug/apps/app_agent_pool.c?view=diff&rev=396022&r1=396021&r2=396022
==============================================================================
--- team/mmichelson/queue_bugbug/apps/app_agent_pool.c (original)
+++ team/mmichelson/queue_bugbug/apps/app_agent_pool.c Thu Aug 1 14:25:09 2013
@@ -40,9 +40,10 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/channel.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_internal.h"
-#include "asterisk/bridging_basic.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_internal.h"
+#include "asterisk/bridge_basic.h"
+#include "asterisk/bridge_after.h"
#include "asterisk/config_options.h"
#include "asterisk/features_config.h"
#include "asterisk/astobj2.h"
@@ -201,49 +202,12 @@
<para>Epoche time when the agent logged in.</para>
<para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
</parameter>
- <parameter name="Channel">
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='Channel']/para)" />
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="ChannelState">
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='ChannelState']/para)" />
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="ChannelStateDesc">
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='ChannelStateDesc']/para)" />
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='ChannelStateDesc']/enumlist)" />
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="CallerIDNum">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="CallerIDName">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="ConnectedLineNum">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="ConnectedLineName">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="AccountCode">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="Context">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="Exten">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="Priority">
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
- <parameter name="Uniqueid">
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter[@name='Uniqueid']/para)" />
- <para>Present if Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
- </parameter>
+ <channel_snapshot/>
<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
</syntax>
+ <description>
+ <para>The channel snapshot is present if the Status value is <literal>AGENT_IDLE</literal> or <literal>AGENT_ONCALL</literal>.</para>
+ </description>
<see-also>
<ref type="manager">Agents</ref>
</see-also>
@@ -1055,7 +1019,7 @@
if (!caller_bridge) {
/* Reset agent. */
- ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
+ ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END);
return;
}
res = ast_bridge_move(caller_bridge, bridge_channel->bridge, bridge_channel->chan,
@@ -1063,7 +1027,7 @@
if (res) {
/* Reset agent. */
ast_bridge_destroy(caller_bridge);
- ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
+ ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END);
return;
}
ast_bridge_channel_write_control_data(bridge_channel, AST_CONTROL_ANSWER, NULL, 0);
@@ -1077,12 +1041,11 @@
* The agent is in the new bridge so we can invoke the
* mixmonitor hook to only start recording.
*/
- ast_bridge_features_do(AST_BRIDGE_BUILTIN_AUTOMIXMON, caller_bridge,
- bridge_channel, &options);
- }
-}
-
-static int bridge_agent_hold_ack(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, void *hook_pvt)
+ ast_bridge_features_do(AST_BRIDGE_BUILTIN_AUTOMIXMON, bridge_channel, &options);
+ }
+}
+
+static int bridge_agent_hold_ack(struct ast_bridge_channel *bridge_channel, void *hook_pvt)
{
struct agent_pvt *agent = hook_pvt;
@@ -1100,7 +1063,7 @@
return 0;
}
-static int bridge_agent_hold_heartbeat(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, void *hook_pvt)
+static int bridge_agent_hold_heartbeat(struct ast_bridge_channel *bridge_channel, void *hook_pvt)
{
struct agent_pvt *agent = hook_pvt;
int probation_timedout = 0;
@@ -1159,13 +1122,13 @@
if (deferred_logoff) {
ast_debug(1, "Agent %s: Deferred logoff.\n", agent->username);
- ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
+ ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END);
} else if (probation_timedout) {
ast_debug(1, "Agent %s: Login complete.\n", agent->username);
agent_devstate_changed(agent->username);
} else if (ack_timedout) {
ast_debug(1, "Agent %s: Ack call timeout.\n", agent->username);
- ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
+ ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END);
} else if (wrapup_timedout) {
ast_debug(1, "Agent %s: Wrapup timeout. Ready for new call.\n", agent->username);
agent_devstate_changed(agent->username);
@@ -1175,7 +1138,7 @@
}
static void agent_after_bridge_cb(struct ast_channel *chan, void *data);
-static void agent_after_bridge_cb_failed(enum ast_after_bridge_cb_reason reason, void *data);
+static void agent_after_bridge_cb_failed(enum ast_bridge_after_cb_reason reason, void *data);
/*!
* \internal
@@ -1252,7 +1215,7 @@
}
if (swap) {
- res = ast_after_bridge_callback_set(chan, agent_after_bridge_cb,
+ res = ast_bridge_set_after_callback(chan, agent_after_bridge_cb,
agent_after_bridge_cb_failed, chan);
if (res) {
ast_channel_remove_bridge_role(chan, "holding_participant");
@@ -1270,7 +1233,7 @@
* agent will have some slightly different behavior in corner
* cases.
*/
- ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
+ ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END);
return 0;
}
@@ -1402,7 +1365,7 @@
return bridge;
}
-static void bridging_init_agent_hold(void)
+static void bridge_init_agent_hold(void)
{
/* Setup bridge agent_hold subclass v_table. */
bridge_agent_hold_v_table = ast_bridge_base_v_table;
@@ -1620,7 +1583,7 @@
ao2_ref(agent, -1);
}
[... 11208 lines stripped ...]
More information about the asterisk-commits
mailing list