[asterisk-commits] mmichelson: branch mmichelson/queue-reset r157938 - in /team/mmichelson/queue...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Nov 19 17:01:54 CST 2008
Author: mmichelson
Date: Wed Nov 19 17:01:51 2008
New Revision: 157938
URL: http://svn.digium.com/view/asterisk?view=rev&rev=157938
Log:
Resolve conflict and reset automerge
Added:
team/mmichelson/queue-reset/UPGRADE-1.6.txt
- copied unchanged from r157906, trunk/UPGRADE-1.6.txt
team/mmichelson/queue-reset/Zaptel-to-DAHDI.txt
- copied unchanged from r157906, trunk/Zaptel-to-DAHDI.txt
team/mmichelson/queue-reset/apps/app_dahdibarge.c
- copied unchanged from r157906, trunk/apps/app_dahdibarge.c
team/mmichelson/queue-reset/apps/app_dahdiras.c
- copied unchanged from r157906, trunk/apps/app_dahdiras.c
team/mmichelson/queue-reset/apps/app_dahdiscan.c
- copied unchanged from r157906, trunk/apps/app_dahdiscan.c
team/mmichelson/queue-reset/autoconf/
- copied from r157906, trunk/autoconf/
team/mmichelson/queue-reset/autoconf/acx_pthread.m4
- copied unchanged from r157906, trunk/autoconf/acx_pthread.m4
team/mmichelson/queue-reset/autoconf/ast_c_compile_check.m4
- copied unchanged from r157906, trunk/autoconf/ast_c_compile_check.m4
team/mmichelson/queue-reset/autoconf/ast_c_define_check.m4
- copied unchanged from r157906, trunk/autoconf/ast_c_define_check.m4
team/mmichelson/queue-reset/autoconf/ast_check_gnu_make.m4
- copied unchanged from r157906, trunk/autoconf/ast_check_gnu_make.m4
team/mmichelson/queue-reset/autoconf/ast_check_mandatory.m4
- copied unchanged from r157906, trunk/autoconf/ast_check_mandatory.m4
team/mmichelson/queue-reset/autoconf/ast_check_openh323.m4
- copied unchanged from r157906, trunk/autoconf/ast_check_openh323.m4
team/mmichelson/queue-reset/autoconf/ast_check_pwlib.m4
- copied unchanged from r157906, trunk/autoconf/ast_check_pwlib.m4
team/mmichelson/queue-reset/autoconf/ast_ext_lib.m4
- copied unchanged from r157906, trunk/autoconf/ast_ext_lib.m4
team/mmichelson/queue-reset/autoconf/ast_ext_tool_check.m4
- copied unchanged from r157906, trunk/autoconf/ast_ext_tool_check.m4
team/mmichelson/queue-reset/autoconf/ast_func_fork.m4
- copied unchanged from r157906, trunk/autoconf/ast_func_fork.m4
team/mmichelson/queue-reset/autoconf/ast_gcc_attribute.m4
- copied unchanged from r157906, trunk/autoconf/ast_gcc_attribute.m4
team/mmichelson/queue-reset/autoconf/ast_prog_egrep.m4
- copied unchanged from r157906, trunk/autoconf/ast_prog_egrep.m4
team/mmichelson/queue-reset/autoconf/ast_prog_ld.m4
- copied unchanged from r157906, trunk/autoconf/ast_prog_ld.m4
team/mmichelson/queue-reset/autoconf/ast_prog_ld_gnu.m4
- copied unchanged from r157906, trunk/autoconf/ast_prog_ld_gnu.m4
team/mmichelson/queue-reset/autoconf/ast_prog_sed.m4
- copied unchanged from r157906, trunk/autoconf/ast_prog_sed.m4
team/mmichelson/queue-reset/build_tools/get_documentation
- copied unchanged from r157906, trunk/build_tools/get_documentation
team/mmichelson/queue-reset/channels/chan_dahdi.c
- copied unchanged from r157906, trunk/channels/chan_dahdi.c
team/mmichelson/queue-reset/codecs/codec_dahdi.c
- copied unchanged from r157906, trunk/codecs/codec_dahdi.c
team/mmichelson/queue-reset/codecs/ex_adpcm.h
- copied unchanged from r157906, trunk/codecs/ex_adpcm.h
team/mmichelson/queue-reset/codecs/ex_alaw.h
- copied unchanged from r157906, trunk/codecs/ex_alaw.h
team/mmichelson/queue-reset/codecs/ex_g722.h
- copied unchanged from r157906, trunk/codecs/ex_g722.h
team/mmichelson/queue-reset/codecs/ex_g726.h
- copied unchanged from r157906, trunk/codecs/ex_g726.h
team/mmichelson/queue-reset/codecs/ex_gsm.h
- copied unchanged from r157906, trunk/codecs/ex_gsm.h
team/mmichelson/queue-reset/codecs/ex_ilbc.h
- copied unchanged from r157906, trunk/codecs/ex_ilbc.h
team/mmichelson/queue-reset/codecs/ex_lpc10.h
- copied unchanged from r157906, trunk/codecs/ex_lpc10.h
team/mmichelson/queue-reset/codecs/ex_speex.h
- copied unchanged from r157906, trunk/codecs/ex_speex.h
team/mmichelson/queue-reset/codecs/ex_ulaw.h
- copied unchanged from r157906, trunk/codecs/ex_ulaw.h
team/mmichelson/queue-reset/configs/ais.conf.sample
- copied unchanged from r157906, trunk/configs/ais.conf.sample
team/mmichelson/queue-reset/configs/chan_dahdi.conf.sample
- copied unchanged from r157906, trunk/configs/chan_dahdi.conf.sample
team/mmichelson/queue-reset/configs/cli_aliases.conf.sample
- copied unchanged from r157906, trunk/configs/cli_aliases.conf.sample
team/mmichelson/queue-reset/contrib/init.d/rc.archlinux.asterisk
- copied unchanged from r157906, trunk/contrib/init.d/rc.archlinux.asterisk
team/mmichelson/queue-reset/contrib/init.d/rc.mandriva.asterisk
- copied unchanged from r157906, trunk/contrib/init.d/rc.mandriva.asterisk
team/mmichelson/queue-reset/contrib/init.d/rc.mandriva.zaptel
- copied unchanged from r157906, trunk/contrib/init.d/rc.mandriva.zaptel
team/mmichelson/queue-reset/contrib/scripts/asterisk.logrotate
- copied unchanged from r157906, trunk/contrib/scripts/asterisk.logrotate
team/mmichelson/queue-reset/contrib/scripts/live_ast
- copied unchanged from r157906, trunk/contrib/scripts/live_ast
team/mmichelson/queue-reset/doc/appdocsxml.dtd
- copied unchanged from r157906, trunk/doc/appdocsxml.dtd
team/mmichelson/queue-reset/doc/distributed_devstate.txt
- copied unchanged from r157906, trunk/doc/distributed_devstate.txt
team/mmichelson/queue-reset/doc/followme.txt
- copied unchanged from r157906, trunk/doc/followme.txt
team/mmichelson/queue-reset/doc/hoard.txt
- copied unchanged from r157906, trunk/doc/hoard.txt
team/mmichelson/queue-reset/doc/lang/
- copied from r157906, trunk/doc/lang/
team/mmichelson/queue-reset/doc/lang/hebrew.ods
- copied unchanged from r157906, trunk/doc/lang/hebrew.ods
team/mmichelson/queue-reset/doc/realtimetext.txt
- copied unchanged from r157906, trunk/doc/realtimetext.txt
team/mmichelson/queue-reset/doc/sip-retransmit.txt
- copied unchanged from r157906, trunk/doc/sip-retransmit.txt
team/mmichelson/queue-reset/doc/video_console.txt
- copied unchanged from r157906, trunk/doc/video_console.txt
team/mmichelson/queue-reset/include/asterisk/buildinfo.h
- copied unchanged from r157906, trunk/include/asterisk/buildinfo.h
team/mmichelson/queue-reset/include/asterisk/datastore.h
- copied unchanged from r157906, trunk/include/asterisk/datastore.h
team/mmichelson/queue-reset/include/asterisk/fskmodem_float.h
- copied unchanged from r157906, trunk/include/asterisk/fskmodem_float.h
team/mmichelson/queue-reset/include/asterisk/fskmodem_int.h
- copied unchanged from r157906, trunk/include/asterisk/fskmodem_int.h
team/mmichelson/queue-reset/include/asterisk/slin.h
- copied unchanged from r157906, trunk/include/asterisk/slin.h
team/mmichelson/queue-reset/include/asterisk/timing.h
- copied unchanged from r157906, trunk/include/asterisk/timing.h
team/mmichelson/queue-reset/include/asterisk/xml.h
- copied unchanged from r157906, trunk/include/asterisk/xml.h
team/mmichelson/queue-reset/include/asterisk/xmldoc.h
- copied unchanged from r157906, trunk/include/asterisk/xmldoc.h
team/mmichelson/queue-reset/main/datastore.c
- copied unchanged from r157906, trunk/main/datastore.c
team/mmichelson/queue-reset/main/editline/makelist.in
- copied unchanged from r157906, trunk/main/editline/makelist.in
team/mmichelson/queue-reset/main/fskmodem_float.c
- copied unchanged from r157906, trunk/main/fskmodem_float.c
team/mmichelson/queue-reset/main/fskmodem_int.c
- copied unchanged from r157906, trunk/main/fskmodem_int.c
team/mmichelson/queue-reset/main/timing.c
- copied unchanged from r157906, trunk/main/timing.c
team/mmichelson/queue-reset/main/xml.c
- copied unchanged from r157906, trunk/main/xml.c
team/mmichelson/queue-reset/main/xmldoc.c
- copied unchanged from r157906, trunk/main/xmldoc.c
team/mmichelson/queue-reset/pbx/ael/ael-test/ael-vtest25/
- copied from r157906, trunk/pbx/ael/ael-test/ael-vtest25/
team/mmichelson/queue-reset/pbx/ael/ael-test/ael-vtest25/extensions.ael
- copied unchanged from r157906, trunk/pbx/ael/ael-test/ael-vtest25/extensions.ael
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-vtest25
- copied unchanged from r157906, trunk/pbx/ael/ael-test/ref.ael-vtest25
team/mmichelson/queue-reset/res/ais/
- copied from r157906, trunk/res/ais/
team/mmichelson/queue-reset/res/ais/ais.h
- copied unchanged from r157906, trunk/res/ais/ais.h
team/mmichelson/queue-reset/res/ais/clm.c
- copied unchanged from r157906, trunk/res/ais/clm.c
team/mmichelson/queue-reset/res/ais/evt.c
- copied unchanged from r157906, trunk/res/ais/evt.c
team/mmichelson/queue-reset/res/res_ais.c
- copied unchanged from r157906, trunk/res/res_ais.c
team/mmichelson/queue-reset/res/res_clialiases.c
- copied unchanged from r157906, trunk/res/res_clialiases.c
team/mmichelson/queue-reset/res/res_curl.c
- copied unchanged from r157906, trunk/res/res_curl.c
team/mmichelson/queue-reset/res/res_timing_dahdi.c
- copied unchanged from r157906, trunk/res/res_timing_dahdi.c
team/mmichelson/queue-reset/res/res_timing_pthread.c
- copied unchanged from r157906, trunk/res/res_timing_pthread.c
team/mmichelson/queue-reset/res/res_timing_timerfd.c
- copied unchanged from r157906, trunk/res/res_timing_timerfd.c
Removed:
team/mmichelson/queue-reset/acinclude.m4
team/mmichelson/queue-reset/apps/app_zapbarge.c
team/mmichelson/queue-reset/apps/app_zapras.c
team/mmichelson/queue-reset/apps/app_zapscan.c
team/mmichelson/queue-reset/channels/chan_zap.c
team/mmichelson/queue-reset/codecs/adpcm_slin_ex.h
team/mmichelson/queue-reset/codecs/codec_zap.c
team/mmichelson/queue-reset/codecs/g722_slin_ex.h
team/mmichelson/queue-reset/codecs/g726_slin_ex.h
team/mmichelson/queue-reset/codecs/gsm_slin_ex.h
team/mmichelson/queue-reset/codecs/ilbc_slin_ex.h
team/mmichelson/queue-reset/codecs/lpc10_slin_ex.h
team/mmichelson/queue-reset/codecs/slin_adpcm_ex.h
team/mmichelson/queue-reset/codecs/slin_g722_ex.h
team/mmichelson/queue-reset/codecs/slin_g726_ex.h
team/mmichelson/queue-reset/codecs/slin_gsm_ex.h
team/mmichelson/queue-reset/codecs/slin_ilbc_ex.h
team/mmichelson/queue-reset/codecs/slin_lpc10_ex.h
team/mmichelson/queue-reset/codecs/slin_resample_ex.h
team/mmichelson/queue-reset/codecs/slin_speex_ex.h
team/mmichelson/queue-reset/codecs/slin_ulaw_ex.h
team/mmichelson/queue-reset/codecs/speex_slin_ex.h
team/mmichelson/queue-reset/codecs/ulaw_slin_ex.h
team/mmichelson/queue-reset/configs/zapata.conf.sample
team/mmichelson/queue-reset/contrib/init.d/rc.mandrake.asterisk
team/mmichelson/queue-reset/contrib/init.d/rc.mandrake.zaptel
team/mmichelson/queue-reset/include/asterisk/dlfcn-compat.h
team/mmichelson/queue-reset/include/asterisk/libresample.h
team/mmichelson/queue-reset/include/asterisk/zapata.h
team/mmichelson/queue-reset/main/dlfcn.c
team/mmichelson/queue-reset/main/editline/makelist
team/mmichelson/queue-reset/main/libresample/
team/mmichelson/queue-reset/redhat/
team/mmichelson/queue-reset/utils/build-extensions-conf.lua
Modified:
team/mmichelson/queue-reset/ (props changed)
team/mmichelson/queue-reset/CHANGES
team/mmichelson/queue-reset/LICENSE
team/mmichelson/queue-reset/Makefile
team/mmichelson/queue-reset/Makefile.moddir_rules
team/mmichelson/queue-reset/Makefile.rules
team/mmichelson/queue-reset/README
team/mmichelson/queue-reset/UPGRADE.txt (contents, props changed)
team/mmichelson/queue-reset/agi/Makefile
team/mmichelson/queue-reset/agi/eagi-sphinx-test.c
team/mmichelson/queue-reset/agi/eagi-test.c
team/mmichelson/queue-reset/apps/Makefile
team/mmichelson/queue-reset/apps/app_adsiprog.c
team/mmichelson/queue-reset/apps/app_alarmreceiver.c
team/mmichelson/queue-reset/apps/app_amd.c
team/mmichelson/queue-reset/apps/app_authenticate.c
team/mmichelson/queue-reset/apps/app_cdr.c
team/mmichelson/queue-reset/apps/app_chanisavail.c
team/mmichelson/queue-reset/apps/app_channelredirect.c
team/mmichelson/queue-reset/apps/app_chanspy.c
team/mmichelson/queue-reset/apps/app_controlplayback.c
team/mmichelson/queue-reset/apps/app_db.c
team/mmichelson/queue-reset/apps/app_dial.c
team/mmichelson/queue-reset/apps/app_dictate.c
team/mmichelson/queue-reset/apps/app_directed_pickup.c
team/mmichelson/queue-reset/apps/app_directory.c
team/mmichelson/queue-reset/apps/app_disa.c
team/mmichelson/queue-reset/apps/app_dumpchan.c
team/mmichelson/queue-reset/apps/app_echo.c
team/mmichelson/queue-reset/apps/app_exec.c
team/mmichelson/queue-reset/apps/app_externalivr.c
team/mmichelson/queue-reset/apps/app_fax.c
team/mmichelson/queue-reset/apps/app_festival.c
team/mmichelson/queue-reset/apps/app_flash.c
team/mmichelson/queue-reset/apps/app_followme.c
team/mmichelson/queue-reset/apps/app_forkcdr.c
team/mmichelson/queue-reset/apps/app_getcpeid.c
team/mmichelson/queue-reset/apps/app_ices.c
team/mmichelson/queue-reset/apps/app_image.c
team/mmichelson/queue-reset/apps/app_ivrdemo.c
team/mmichelson/queue-reset/apps/app_jack.c
team/mmichelson/queue-reset/apps/app_macro.c
team/mmichelson/queue-reset/apps/app_meetme.c
team/mmichelson/queue-reset/apps/app_milliwatt.c
team/mmichelson/queue-reset/apps/app_minivm.c
team/mmichelson/queue-reset/apps/app_mixmonitor.c
team/mmichelson/queue-reset/apps/app_morsecode.c
team/mmichelson/queue-reset/apps/app_mp3.c
team/mmichelson/queue-reset/apps/app_nbscat.c
team/mmichelson/queue-reset/apps/app_osplookup.c
team/mmichelson/queue-reset/apps/app_page.c
team/mmichelson/queue-reset/apps/app_parkandannounce.c
team/mmichelson/queue-reset/apps/app_playback.c
team/mmichelson/queue-reset/apps/app_privacy.c
team/mmichelson/queue-reset/apps/app_queue.c
team/mmichelson/queue-reset/apps/app_read.c
team/mmichelson/queue-reset/apps/app_readexten.c
team/mmichelson/queue-reset/apps/app_readfile.c
team/mmichelson/queue-reset/apps/app_record.c
team/mmichelson/queue-reset/apps/app_rpt.c
team/mmichelson/queue-reset/apps/app_sayunixtime.c
team/mmichelson/queue-reset/apps/app_senddtmf.c
team/mmichelson/queue-reset/apps/app_sendtext.c
team/mmichelson/queue-reset/apps/app_setcallerid.c
team/mmichelson/queue-reset/apps/app_skel.c
team/mmichelson/queue-reset/apps/app_sms.c
team/mmichelson/queue-reset/apps/app_softhangup.c
team/mmichelson/queue-reset/apps/app_speech_utils.c
team/mmichelson/queue-reset/apps/app_stack.c
team/mmichelson/queue-reset/apps/app_system.c
team/mmichelson/queue-reset/apps/app_talkdetect.c
team/mmichelson/queue-reset/apps/app_test.c
team/mmichelson/queue-reset/apps/app_transfer.c
team/mmichelson/queue-reset/apps/app_url.c
team/mmichelson/queue-reset/apps/app_userevent.c
team/mmichelson/queue-reset/apps/app_verbose.c
team/mmichelson/queue-reset/apps/app_voicemail.c
team/mmichelson/queue-reset/apps/app_waitforring.c
team/mmichelson/queue-reset/apps/app_waitforsilence.c
team/mmichelson/queue-reset/apps/app_waituntil.c
team/mmichelson/queue-reset/apps/app_while.c
team/mmichelson/queue-reset/apps/app_zapateller.c
team/mmichelson/queue-reset/bootstrap.sh
team/mmichelson/queue-reset/build_tools/cflags.xml
team/mmichelson/queue-reset/build_tools/get_makeopts
team/mmichelson/queue-reset/build_tools/get_moduleinfo
team/mmichelson/queue-reset/build_tools/make_buildopts_h
team/mmichelson/queue-reset/build_tools/make_version
team/mmichelson/queue-reset/build_tools/menuselect-deps.in
team/mmichelson/queue-reset/build_tools/prep_tarball
team/mmichelson/queue-reset/build_tools/strip_nonapi
team/mmichelson/queue-reset/cdr/cdr_adaptive_odbc.c
team/mmichelson/queue-reset/cdr/cdr_csv.c
team/mmichelson/queue-reset/cdr/cdr_custom.c
team/mmichelson/queue-reset/cdr/cdr_manager.c
team/mmichelson/queue-reset/cdr/cdr_odbc.c
team/mmichelson/queue-reset/cdr/cdr_pgsql.c
team/mmichelson/queue-reset/cdr/cdr_radius.c
team/mmichelson/queue-reset/cdr/cdr_sqlite.c
team/mmichelson/queue-reset/cdr/cdr_sqlite3_custom.c
team/mmichelson/queue-reset/cdr/cdr_tds.c
team/mmichelson/queue-reset/channels/Makefile
team/mmichelson/queue-reset/channels/chan_agent.c
team/mmichelson/queue-reset/channels/chan_alsa.c
team/mmichelson/queue-reset/channels/chan_console.c
team/mmichelson/queue-reset/channels/chan_features.c
team/mmichelson/queue-reset/channels/chan_gtalk.c
team/mmichelson/queue-reset/channels/chan_h323.c
team/mmichelson/queue-reset/channels/chan_iax2.c
team/mmichelson/queue-reset/channels/chan_jingle.c
team/mmichelson/queue-reset/channels/chan_local.c
team/mmichelson/queue-reset/channels/chan_mgcp.c
team/mmichelson/queue-reset/channels/chan_misdn.c
team/mmichelson/queue-reset/channels/chan_oss.c
team/mmichelson/queue-reset/channels/chan_phone.c
team/mmichelson/queue-reset/channels/chan_sip.c
team/mmichelson/queue-reset/channels/chan_skinny.c
team/mmichelson/queue-reset/channels/chan_unistim.c
team/mmichelson/queue-reset/channels/chan_usbradio.c
team/mmichelson/queue-reset/channels/chan_vpb.cc
team/mmichelson/queue-reset/channels/console_board.c
team/mmichelson/queue-reset/channels/console_gui.c
team/mmichelson/queue-reset/channels/console_video.c
team/mmichelson/queue-reset/channels/console_video.h
team/mmichelson/queue-reset/channels/h323/ast_h323.cxx
team/mmichelson/queue-reset/channels/iax2-parser.c
team/mmichelson/queue-reset/channels/iax2-provision.c
team/mmichelson/queue-reset/channels/iax2.h
team/mmichelson/queue-reset/channels/misdn/isdn_lib.c
team/mmichelson/queue-reset/channels/misdn/isdn_lib.h
team/mmichelson/queue-reset/channels/misdn/isdn_lib_intern.h
team/mmichelson/queue-reset/channels/misdn_config.c
team/mmichelson/queue-reset/channels/vcodecs.c
team/mmichelson/queue-reset/channels/vgrabbers.c
team/mmichelson/queue-reset/channels/xpmr/xpmr.c
team/mmichelson/queue-reset/codecs/Makefile
team/mmichelson/queue-reset/codecs/codec_a_mu.c
team/mmichelson/queue-reset/codecs/codec_adpcm.c
team/mmichelson/queue-reset/codecs/codec_alaw.c
team/mmichelson/queue-reset/codecs/codec_g722.c
team/mmichelson/queue-reset/codecs/codec_g726.c
team/mmichelson/queue-reset/codecs/codec_gsm.c
team/mmichelson/queue-reset/codecs/codec_ilbc.c
team/mmichelson/queue-reset/codecs/codec_lpc10.c
team/mmichelson/queue-reset/codecs/codec_resample.c
team/mmichelson/queue-reset/codecs/codec_speex.c
team/mmichelson/queue-reset/codecs/codec_ulaw.c
team/mmichelson/queue-reset/codecs/lpc10/chanwr.c
team/mmichelson/queue-reset/codecs/lpc10/lpcini.c
team/mmichelson/queue-reset/configs/agents.conf.sample
team/mmichelson/queue-reset/configs/cdr.conf.sample
team/mmichelson/queue-reset/configs/cdr_adaptive_odbc.conf.sample
team/mmichelson/queue-reset/configs/cdr_tds.conf.sample
team/mmichelson/queue-reset/configs/dundi.conf.sample
team/mmichelson/queue-reset/configs/extensions.ael.sample
team/mmichelson/queue-reset/configs/extensions.conf.sample
team/mmichelson/queue-reset/configs/extensions.lua.sample
team/mmichelson/queue-reset/configs/features.conf.sample
team/mmichelson/queue-reset/configs/followme.conf.sample
team/mmichelson/queue-reset/configs/func_odbc.conf.sample
team/mmichelson/queue-reset/configs/gtalk.conf.sample
team/mmichelson/queue-reset/configs/http.conf.sample
team/mmichelson/queue-reset/configs/iax.conf.sample
team/mmichelson/queue-reset/configs/jabber.conf.sample
team/mmichelson/queue-reset/configs/jingle.conf.sample
team/mmichelson/queue-reset/configs/manager.conf.sample
team/mmichelson/queue-reset/configs/meetme.conf.sample
team/mmichelson/queue-reset/configs/misdn.conf.sample
team/mmichelson/queue-reset/configs/modules.conf.sample
team/mmichelson/queue-reset/configs/musiconhold.conf.sample
team/mmichelson/queue-reset/configs/muted.conf.sample
team/mmichelson/queue-reset/configs/phoneprov.conf.sample
team/mmichelson/queue-reset/configs/queues.conf.sample
team/mmichelson/queue-reset/configs/res_ldap.conf.sample
team/mmichelson/queue-reset/configs/res_pgsql.conf.sample
team/mmichelson/queue-reset/configs/rpt.conf.sample
team/mmichelson/queue-reset/configs/rtp.conf.sample
team/mmichelson/queue-reset/configs/sip.conf.sample
team/mmichelson/queue-reset/configs/sip_notify.conf.sample
team/mmichelson/queue-reset/configs/skinny.conf.sample
team/mmichelson/queue-reset/configs/sla.conf.sample
team/mmichelson/queue-reset/configs/smdi.conf.sample
team/mmichelson/queue-reset/configs/users.conf.sample
team/mmichelson/queue-reset/configs/voicemail.conf.sample
team/mmichelson/queue-reset/configs/vpb.conf.sample
team/mmichelson/queue-reset/configure
team/mmichelson/queue-reset/configure.ac
team/mmichelson/queue-reset/contrib/asterisk-ng-doxygen
team/mmichelson/queue-reset/contrib/init.d/rc.debian.asterisk
team/mmichelson/queue-reset/contrib/init.d/rc.redhat.asterisk
team/mmichelson/queue-reset/contrib/init.d/rc.suse.asterisk
team/mmichelson/queue-reset/contrib/scripts/astcli
team/mmichelson/queue-reset/contrib/scripts/asterisk.ldap-schema
team/mmichelson/queue-reset/contrib/scripts/asterisk.ldif
team/mmichelson/queue-reset/contrib/scripts/autosupport
team/mmichelson/queue-reset/contrib/scripts/dbsep.cgi
team/mmichelson/queue-reset/contrib/scripts/get_ilbc_source.sh
team/mmichelson/queue-reset/contrib/scripts/loadtest.tcl
team/mmichelson/queue-reset/contrib/scripts/realtime_pgsql.sql
team/mmichelson/queue-reset/contrib/scripts/safe_asterisk
team/mmichelson/queue-reset/contrib/scripts/safe_asterisk_restart
team/mmichelson/queue-reset/contrib/scripts/vmail.cgi
team/mmichelson/queue-reset/contrib/scripts/vmdb.sql
team/mmichelson/queue-reset/contrib/utils/zones2indications.c
team/mmichelson/queue-reset/doc/ (props changed)
team/mmichelson/queue-reset/doc/CODING-GUIDELINES
team/mmichelson/queue-reset/doc/asterisk-mib.txt
team/mmichelson/queue-reset/doc/asterisk.8
team/mmichelson/queue-reset/doc/asterisk.sgml
team/mmichelson/queue-reset/doc/backtrace.txt
team/mmichelson/queue-reset/doc/digium-mib.txt
team/mmichelson/queue-reset/doc/janitor-projects.txt
team/mmichelson/queue-reset/doc/manager_1_1.txt
team/mmichelson/queue-reset/doc/osp.txt
team/mmichelson/queue-reset/doc/siptls.txt
team/mmichelson/queue-reset/doc/sms.txt
team/mmichelson/queue-reset/doc/ss7.txt
team/mmichelson/queue-reset/doc/tex/Makefile
team/mmichelson/queue-reset/doc/tex/ael.tex
team/mmichelson/queue-reset/doc/tex/app-sms.tex
team/mmichelson/queue-reset/doc/tex/asterisk-conf.tex
team/mmichelson/queue-reset/doc/tex/asterisk.tex
team/mmichelson/queue-reset/doc/tex/backtrace.tex
team/mmichelson/queue-reset/doc/tex/cdrdriver.tex
team/mmichelson/queue-reset/doc/tex/channelvariables.tex
team/mmichelson/queue-reset/doc/tex/cliprompt.tex
team/mmichelson/queue-reset/doc/tex/configuration.tex
team/mmichelson/queue-reset/doc/tex/enum.tex
team/mmichelson/queue-reset/doc/tex/extensions.tex
team/mmichelson/queue-reset/doc/tex/freetds.tex
team/mmichelson/queue-reset/doc/tex/hardware.tex
team/mmichelson/queue-reset/doc/tex/localchannel.tex
team/mmichelson/queue-reset/doc/tex/manager.tex
team/mmichelson/queue-reset/doc/tex/misdn.tex
team/mmichelson/queue-reset/doc/tex/privacy.tex
team/mmichelson/queue-reset/doc/tex/queuelog.tex
team/mmichelson/queue-reset/doc/tex/queues-with-callback-members.tex
team/mmichelson/queue-reset/doc/tex/security.tex
team/mmichelson/queue-reset/doc/tex/sla.tex
team/mmichelson/queue-reset/doc/valgrind.txt
team/mmichelson/queue-reset/doc/video.txt
team/mmichelson/queue-reset/formats/format_gsm.c
team/mmichelson/queue-reset/formats/format_ogg_vorbis.c
team/mmichelson/queue-reset/formats/format_pcm.c
team/mmichelson/queue-reset/formats/format_wav.c
team/mmichelson/queue-reset/formats/format_wav_gsm.c
team/mmichelson/queue-reset/formats/msgsm.h
team/mmichelson/queue-reset/funcs/func_base64.c
team/mmichelson/queue-reset/funcs/func_blacklist.c
team/mmichelson/queue-reset/funcs/func_callerid.c
team/mmichelson/queue-reset/funcs/func_cdr.c
team/mmichelson/queue-reset/funcs/func_channel.c
team/mmichelson/queue-reset/funcs/func_config.c
team/mmichelson/queue-reset/funcs/func_curl.c
team/mmichelson/queue-reset/funcs/func_cut.c
team/mmichelson/queue-reset/funcs/func_db.c
team/mmichelson/queue-reset/funcs/func_devstate.c
team/mmichelson/queue-reset/funcs/func_dialgroup.c
team/mmichelson/queue-reset/funcs/func_dialplan.c
team/mmichelson/queue-reset/funcs/func_enum.c
team/mmichelson/queue-reset/funcs/func_env.c
team/mmichelson/queue-reset/funcs/func_extstate.c
team/mmichelson/queue-reset/funcs/func_global.c
team/mmichelson/queue-reset/funcs/func_groupcount.c
team/mmichelson/queue-reset/funcs/func_iconv.c
team/mmichelson/queue-reset/funcs/func_lock.c
team/mmichelson/queue-reset/funcs/func_logic.c
team/mmichelson/queue-reset/funcs/func_math.c
team/mmichelson/queue-reset/funcs/func_md5.c
team/mmichelson/queue-reset/funcs/func_module.c
team/mmichelson/queue-reset/funcs/func_odbc.c
team/mmichelson/queue-reset/funcs/func_rand.c
team/mmichelson/queue-reset/funcs/func_realtime.c
team/mmichelson/queue-reset/funcs/func_sha1.c
team/mmichelson/queue-reset/funcs/func_shell.c
team/mmichelson/queue-reset/funcs/func_speex.c
team/mmichelson/queue-reset/funcs/func_strings.c
team/mmichelson/queue-reset/funcs/func_sysinfo.c
team/mmichelson/queue-reset/funcs/func_timeout.c
team/mmichelson/queue-reset/funcs/func_uri.c
team/mmichelson/queue-reset/funcs/func_version.c
team/mmichelson/queue-reset/funcs/func_vmcount.c
team/mmichelson/queue-reset/funcs/func_volume.c
team/mmichelson/queue-reset/images/kpad2.jpg
team/mmichelson/queue-reset/include/asterisk.h
team/mmichelson/queue-reset/include/asterisk/_private.h
team/mmichelson/queue-reset/include/asterisk/abstract_jb.h
team/mmichelson/queue-reset/include/asterisk/ael_structs.h
team/mmichelson/queue-reset/include/asterisk/agi.h
team/mmichelson/queue-reset/include/asterisk/app.h
team/mmichelson/queue-reset/include/asterisk/astmm.h
team/mmichelson/queue-reset/include/asterisk/astobj.h
team/mmichelson/queue-reset/include/asterisk/astobj2.h
team/mmichelson/queue-reset/include/asterisk/audiohook.h
team/mmichelson/queue-reset/include/asterisk/autoconfig.h.in
team/mmichelson/queue-reset/include/asterisk/callerid.h
team/mmichelson/queue-reset/include/asterisk/causes.h
team/mmichelson/queue-reset/include/asterisk/cdr.h
team/mmichelson/queue-reset/include/asterisk/channel.h
team/mmichelson/queue-reset/include/asterisk/chanvars.h
team/mmichelson/queue-reset/include/asterisk/cli.h
team/mmichelson/queue-reset/include/asterisk/compat.h
team/mmichelson/queue-reset/include/asterisk/compiler.h
team/mmichelson/queue-reset/include/asterisk/config.h
team/mmichelson/queue-reset/include/asterisk/devicestate.h
team/mmichelson/queue-reset/include/asterisk/dial.h
team/mmichelson/queue-reset/include/asterisk/dnsmgr.h
team/mmichelson/queue-reset/include/asterisk/doxyref.h
team/mmichelson/queue-reset/include/asterisk/dsp.h
team/mmichelson/queue-reset/include/asterisk/dundi.h
team/mmichelson/queue-reset/include/asterisk/endian.h
team/mmichelson/queue-reset/include/asterisk/event.h
team/mmichelson/queue-reset/include/asterisk/event_defs.h
team/mmichelson/queue-reset/include/asterisk/extconf.h
team/mmichelson/queue-reset/include/asterisk/features.h
team/mmichelson/queue-reset/include/asterisk/fskmodem.h
team/mmichelson/queue-reset/include/asterisk/hashtab.h
team/mmichelson/queue-reset/include/asterisk/http.h
team/mmichelson/queue-reset/include/asterisk/indications.h
team/mmichelson/queue-reset/include/asterisk/jabber.h
team/mmichelson/queue-reset/include/asterisk/localtime.h
team/mmichelson/queue-reset/include/asterisk/lock.h
team/mmichelson/queue-reset/include/asterisk/logger.h
team/mmichelson/queue-reset/include/asterisk/manager.h
team/mmichelson/queue-reset/include/asterisk/module.h
team/mmichelson/queue-reset/include/asterisk/network.h
team/mmichelson/queue-reset/include/asterisk/options.h
team/mmichelson/queue-reset/include/asterisk/pbx.h
team/mmichelson/queue-reset/include/asterisk/res_odbc.h
team/mmichelson/queue-reset/include/asterisk/rtp.h
team/mmichelson/queue-reset/include/asterisk/sched.h
team/mmichelson/queue-reset/include/asterisk/slinfactory.h
team/mmichelson/queue-reset/include/asterisk/stringfields.h
team/mmichelson/queue-reset/include/asterisk/strings.h
team/mmichelson/queue-reset/include/asterisk/tcptls.h
team/mmichelson/queue-reset/include/asterisk/term.h
team/mmichelson/queue-reset/include/asterisk/threadstorage.h
team/mmichelson/queue-reset/include/asterisk/time.h
team/mmichelson/queue-reset/include/asterisk/translate.h
team/mmichelson/queue-reset/include/asterisk/utils.h
team/mmichelson/queue-reset/main/Makefile
team/mmichelson/queue-reset/main/abstract_jb.c
team/mmichelson/queue-reset/main/acl.c
team/mmichelson/queue-reset/main/app.c
team/mmichelson/queue-reset/main/ast_expr2.c
team/mmichelson/queue-reset/main/ast_expr2.fl
team/mmichelson/queue-reset/main/ast_expr2.h
team/mmichelson/queue-reset/main/ast_expr2.y
team/mmichelson/queue-reset/main/ast_expr2f.c
team/mmichelson/queue-reset/main/asterisk.c
team/mmichelson/queue-reset/main/astmm.c
team/mmichelson/queue-reset/main/astobj2.c
team/mmichelson/queue-reset/main/audiohook.c
team/mmichelson/queue-reset/main/autoservice.c
team/mmichelson/queue-reset/main/buildinfo.c
team/mmichelson/queue-reset/main/callerid.c
team/mmichelson/queue-reset/main/cdr.c
team/mmichelson/queue-reset/main/channel.c
team/mmichelson/queue-reset/main/chanvars.c
team/mmichelson/queue-reset/main/cli.c
team/mmichelson/queue-reset/main/config.c
team/mmichelson/queue-reset/main/cryptostub.c
team/mmichelson/queue-reset/main/db1-ast/btree/bt_delete.c
team/mmichelson/queue-reset/main/db1-ast/btree/bt_put.c
team/mmichelson/queue-reset/main/db1-ast/hash/hash_page.c
team/mmichelson/queue-reset/main/db1-ast/recno/rec_delete.c
team/mmichelson/queue-reset/main/db1-ast/recno/rec_put.c
team/mmichelson/queue-reset/main/devicestate.c
team/mmichelson/queue-reset/main/dial.c
team/mmichelson/queue-reset/main/dns.c
team/mmichelson/queue-reset/main/dnsmgr.c
team/mmichelson/queue-reset/main/dsp.c
team/mmichelson/queue-reset/main/editline/ (props changed)
team/mmichelson/queue-reset/main/editline/Makefile.in
team/mmichelson/queue-reset/main/editline/configure
team/mmichelson/queue-reset/main/editline/configure.in
team/mmichelson/queue-reset/main/editline/np/vis.c
team/mmichelson/queue-reset/main/editline/readline.c
team/mmichelson/queue-reset/main/enum.c
team/mmichelson/queue-reset/main/event.c
team/mmichelson/queue-reset/main/features.c
team/mmichelson/queue-reset/main/file.c
team/mmichelson/queue-reset/main/fixedjitterbuf.h
team/mmichelson/queue-reset/main/frame.c
team/mmichelson/queue-reset/main/fskmodem.c
team/mmichelson/queue-reset/main/hashtab.c
team/mmichelson/queue-reset/main/http.c
team/mmichelson/queue-reset/main/indications.c
team/mmichelson/queue-reset/main/jitterbuf.c
team/mmichelson/queue-reset/main/loader.c
team/mmichelson/queue-reset/main/logger.c
team/mmichelson/queue-reset/main/manager.c
team/mmichelson/queue-reset/main/netsock.c
team/mmichelson/queue-reset/main/pbx.c
team/mmichelson/queue-reset/main/poll.c
team/mmichelson/queue-reset/main/rtp.c
team/mmichelson/queue-reset/main/say.c
team/mmichelson/queue-reset/main/sched.c
team/mmichelson/queue-reset/main/srv.c
team/mmichelson/queue-reset/main/stdtime/localtime.c
team/mmichelson/queue-reset/main/taskprocessor.c
team/mmichelson/queue-reset/main/tcptls.c
team/mmichelson/queue-reset/main/tdd.c
team/mmichelson/queue-reset/main/term.c
team/mmichelson/queue-reset/main/threadstorage.c
team/mmichelson/queue-reset/main/translate.c
team/mmichelson/queue-reset/main/udptl.c
team/mmichelson/queue-reset/main/utils.c
team/mmichelson/queue-reset/makeopts.in
team/mmichelson/queue-reset/pbx/Makefile
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-ntest10
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-test18
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-test19
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-test6
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-test8
team/mmichelson/queue-reset/pbx/ael/ael-test/ref.ael-vtest13
team/mmichelson/queue-reset/pbx/dundi-parser.c
team/mmichelson/queue-reset/pbx/dundi-parser.h
team/mmichelson/queue-reset/pbx/pbx_ael.c
team/mmichelson/queue-reset/pbx/pbx_config.c
team/mmichelson/queue-reset/pbx/pbx_dundi.c
team/mmichelson/queue-reset/pbx/pbx_gtkconsole.c
team/mmichelson/queue-reset/pbx/pbx_lua.c
team/mmichelson/queue-reset/pbx/pbx_realtime.c
team/mmichelson/queue-reset/pbx/pbx_spool.c
team/mmichelson/queue-reset/phoneprov/000000000000.cfg
team/mmichelson/queue-reset/phoneprov/polycom.xml
team/mmichelson/queue-reset/phoneprov/polycom_line.xml
team/mmichelson/queue-reset/res/Makefile
team/mmichelson/queue-reset/res/ael/ael.flex
team/mmichelson/queue-reset/res/ael/ael.tab.c
team/mmichelson/queue-reset/res/ael/ael.tab.h
team/mmichelson/queue-reset/res/ael/ael.y
team/mmichelson/queue-reset/res/ael/ael_lex.c
team/mmichelson/queue-reset/res/ael/pval.c
team/mmichelson/queue-reset/res/res_adsi.c
team/mmichelson/queue-reset/res/res_agi.c
team/mmichelson/queue-reset/res/res_clioriginate.c
team/mmichelson/queue-reset/res/res_config_curl.c
team/mmichelson/queue-reset/res/res_config_ldap.c
team/mmichelson/queue-reset/res/res_config_odbc.c
team/mmichelson/queue-reset/res/res_config_pgsql.c
team/mmichelson/queue-reset/res/res_config_sqlite.c
team/mmichelson/queue-reset/res/res_crypto.c
team/mmichelson/queue-reset/res/res_http_post.c
team/mmichelson/queue-reset/res/res_indications.c
team/mmichelson/queue-reset/res/res_jabber.c
team/mmichelson/queue-reset/res/res_limit.c
team/mmichelson/queue-reset/res/res_musiconhold.c
team/mmichelson/queue-reset/res/res_odbc.c
team/mmichelson/queue-reset/res/res_phoneprov.c
team/mmichelson/queue-reset/res/res_realtime.c
team/mmichelson/queue-reset/res/res_smdi.c
team/mmichelson/queue-reset/res/res_snmp.c
team/mmichelson/queue-reset/sample.call
team/mmichelson/queue-reset/sounds/Makefile
team/mmichelson/queue-reset/sounds/sounds.xml
team/mmichelson/queue-reset/utils/Makefile
team/mmichelson/queue-reset/utils/ael_main.c
team/mmichelson/queue-reset/utils/astcanary.c
team/mmichelson/queue-reset/utils/astman.c
team/mmichelson/queue-reset/utils/conf2ael.c
team/mmichelson/queue-reset/utils/extconf.c
team/mmichelson/queue-reset/utils/frame.c
team/mmichelson/queue-reset/utils/hashtest2.c
team/mmichelson/queue-reset/utils/muted.c
team/mmichelson/queue-reset/utils/smsq.c
team/mmichelson/queue-reset/utils/stereorize.c
team/mmichelson/queue-reset/utils/streamplayer.c
Propchange: team/mmichelson/queue-reset/
------------------------------------------------------------------------------
automerge = *
Propchange: team/mmichelson/queue-reset/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/mmichelson/queue-reset/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/mmichelson/queue-reset/
------------------------------------------------------------------------------
reviewboard:url = http://reviewboard.digium.com
Propchange: team/mmichelson/queue-reset/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 19 17:01:51 2008
@@ -1,1 +1,1 @@
-/trunk:1-120751
+/trunk:1-157907
Modified: team/mmichelson/queue-reset/CHANGES
URL: http://svn.digium.com/view/asterisk/team/mmichelson/queue-reset/CHANGES?view=diff&rev=157938&r1=157937&r2=157938
==============================================================================
--- team/mmichelson/queue-reset/CHANGES (original)
+++ team/mmichelson/queue-reset/CHANGES Wed Nov 19 17:01:51 2008
@@ -1,6 +1,82 @@
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2 -------------
+------------------------------------------------------------------------------
+
+SIP Changes
+-----------
+ * Added support for SUBSCRIBE/NOTIFY with dialog-info based call pickups.
+ Snom phones use this for call pickup of extensions that the phone is
+ subscribed to.
+ * Added support for subscribing to a voice mailbox on a remote server and
+ making the new/old message count available to local devices.
+ * Added support for setting the domain in the URI for caller of an
+ outbound call by using the SIPFROMDOMAIN channel variable.
+ * Added a new configuration option "remotesecret" for authentication to
+ remote services. For backwards compatibility, "secret" still has the
+ same function as before, but now you can configure both a remote secret and a
+ local secret for mutual authentication.
+
+Skinny Changes
+--------------
+ * The configuration file now holds seperate sections for devices and lines.
+ Please have a look at configs/skinny.conf.sample and change your skinny.conf
+ accordingly.
+
+Dialplan Functions
+------------------
+ * Added a new dialplan function, CURLOPT, which permits setting various
+ options that may be useful with the CURL dialplan function, such as
+ cookies, proxies, connection timeouts, passwords, etc.
+ * Permit the syntax and synopsis fields of the corresponding dialplan
+ functions to be individually set from func_odbc.conf.
+ * Added debugging CLI functions to func_odbc, 'odbc read' and 'odbc write'.
+ * func_odbc now may specify an insert query to execute, when the write query
+ affects 0 rows (usually indicating that no such row exists).
+ * Added a new dialplan function, LISTFILTER, which permits removing elements
+ from a set list, by name. Uses the same general syntax as the existing CUT
+ and FIELDQTY dialplan functions, which also manage lists.
[... 112632 lines stripped ...]
More information about the asterisk-commits
mailing list