Tilghman Lesher 77ad8a2556 Merged revisions 218361 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
  r218361 | tilghman | 2009-09-14 14:29:48 -0500 (Mon, 14 Sep 2009) | 11 lines
  
  Recorded merge of revisions 218331 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218331 | tilghman | 2009-09-14 14:16:35 -0500 (Mon, 14 Sep 2009) | 4 lines
    
    Don't say "Please try again" if we don't give the user another chance to try again.
    (issue #15055, SWP-129)
     Reported by: jthurman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218362 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-09-14 19:49:04 +00:00

..

adsi.conf.sample

…

adtranvofr.conf.sample

…

agents.conf.sample

Merged revisions 149756 via svnmerge from

2008-10-15 20:18:44 +00:00

alarmreceiver.conf.sample

…

alsa.conf.sample

…

amd.conf.sample

…

asterisk.adsi

…

cdr_adaptive_odbc.conf.sample

Add the "filter" keyword

2008-01-15 23:52:11 +00:00

cdr_custom.conf.sample

…

cdr_manager.conf.sample

…

cdr_odbc.conf.sample

…

cdr_pgsql.conf.sample

…

cdr_sqlite3_custom.conf.sample

Fix a few potential deadlocks in cdr_sqlite3_custom.

2007-11-09 16:32:01 +00:00

cdr_tds.conf.sample

Merged revisions 138442 via svnmerge from

2008-08-16 16:41:52 +00:00

cdr.conf.sample

Merged revisions 113875 via svnmerge from

2008-04-09 19:02:27 +00:00

chan_dahdi.conf.sample

Merged revisions 207095 via svnmerge from

2009-07-17 19:17:33 +00:00

cli.conf.sample

Clarify configuration file that can be misunderstood

2008-01-30 20:08:58 +00:00

codecs.conf.sample

…

console.conf.sample

correct the name of a CLI command for getting available device names

2008-01-20 06:13:22 +00:00

dnsmgr.conf.sample

…

dundi.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

enum.conf.sample

…

extconfig.conf.sample

Merged revisions 168722 via svnmerge from

2009-01-15 18:52:54 +00:00

extensions_minivm.conf.sample

…

extensions.ael.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-17 18:08:09 +00:00

extensions.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:11:14 +00:00

extensions.lua.sample

Merged revisions 144523 via svnmerge from

2008-09-25 21:21:33 +00:00

features.conf.sample

Merged revisions 186175 via svnmerge from

2009-04-02 21:58:37 +00:00

festival.conf.sample

…

followme.conf.sample

…

func_odbc.conf.sample

Eliminate mention of a variable which is only available in trunk.

2009-02-16 17:06:39 +00:00

gtalk.conf.sample

Merged revisions 132514 via svnmerge from

2008-07-21 21:13:46 +00:00

h323.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

http.conf.sample

Merged revisions 125191 via svnmerge from

2008-06-26 01:13:45 +00:00

iax.conf.sample

Merged revisions 215955 via svnmerge from

2009-09-03 18:40:12 +00:00

iaxprov.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

indications.conf.sample

Merged revisions 168481 via svnmerge from

2009-01-12 14:58:38 +00:00

jabber.conf.sample

Merged revisions 142280 via svnmerge from

2008-09-09 22:14:40 +00:00

jingle.conf.sample

Merged revisions 132514 via svnmerge from

2008-07-21 21:13:46 +00:00

logger.conf.sample

Merged revisions 194765 via svnmerge from

2009-05-15 18:43:58 +00:00

manager.conf.sample

Merged revisions 132514 via svnmerge from

2008-07-21 21:13:46 +00:00

meetme.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-17 18:08:09 +00:00

mgcp.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

minivm.conf.sample

…

misdn.conf.sample

Merged revisions 145293,158010 from

2009-07-18 01:35:06 +00:00

modules.conf.sample

Merged revisions 191955 via svnmerge from

2009-05-04 09:58:56 +00:00

musiconhold.conf.sample

Adding support for realtime music on hold. The following are the main points:

2007-11-28 00:47:22 +00:00

muted.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-17 18:08:09 +00:00

osp.conf.sample

Revert revision 190576 after out of band discussion with transnexus.

2009-04-29 07:37:04 +00:00

oss.conf.sample

Change the name of config file entries for keypad regions

2007-12-22 22:44:31 +00:00

phone.conf.sample

…

phoneprov.conf.sample

Update res_phoneprov to default to setting the SERVER variable to the IP

2008-01-17 03:09:32 +00:00

queuerules.conf.sample

Merging the queue-penalty branch. In short, this allows one to dynamically adjust

2007-12-21 00:44:17 +00:00

queues.conf.sample

Merged revisions 213494 via svnmerge from

2009-08-21 16:05:52 +00:00

res_config_sqlite.conf

Various code and documentation cleanups for res_config_sqlite

2007-09-13 15:26:40 +00:00

res_ldap.conf.sample

issue #15155 and issue #15156 from trunk

2009-05-28 11:40:15 +00:00

res_odbc.conf.sample

Merged revisions 170837 via svnmerge from

2009-01-24 13:56:42 +00:00

res_pgsql.conf.sample

…

res_snmp.conf.sample

…

rpt.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-17 18:08:09 +00:00

rtp.conf.sample

Merged revisions 144829 via svnmerge from

2008-09-26 23:14:29 +00:00

say.conf.sample

…

sip_notify.conf.sample

Merged revisions 109111 via svnmerge from

2008-03-18 15:52:41 +00:00

sip.conf.sample

fix documentation so it agrees with code

2009-09-07 12:00:56 +00:00

skinny.conf.sample

Merged revisions 113119 via svnmerge from

2008-04-07 19:10:45 +00:00

sla.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:11:14 +00:00

smdi.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:11:14 +00:00

telcordia-1.adsi

…

udptl.conf.sample

Merged revisions 209132 via svnmerge from

2009-07-27 17:52:36 +00:00

unistim.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

usbradio.conf.sample

Add usbradio.conf.sample from branches/1.4/configs - r84162.

2007-11-09 18:57:21 +00:00

users.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-17 18:08:09 +00:00

voicemail.conf.sample

Merged revisions 218361 via svnmerge from

2009-09-14 19:49:04 +00:00

vpb.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:11:14 +00:00