Jared Smith b5aa2a5e49 Merged revisions 235298 via svnmerge from ...

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

................
  r235298 | jsmith | 2009-12-15 23:24:58 -0600 (Tue, 15 Dec 2009) | 11 lines
  
  Merged revisions 235181 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r235181 | jsmith | 2009-12-15 15:07:55 -0600 (Tue, 15 Dec 2009) | 4 lines
    
    Add a line showing that we can use CIDR notation.
    
    patch by jsmith, after discussion with jtodd
  ........
................


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

2009-12-16 16:27:27 +00:00

..

adsi.conf.sample

…

adtranvofr.conf.sample

…

agents.conf.sample

Merged revisions 149756 via svnmerge from

2008-10-15 20:22:00 +00:00

ais.conf.sample

Merged revisions 179164 via svnmerge from

2009-02-27 21:48:00 +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

Merged revisions 221368 via svnmerge from

2009-09-30 20:10:02 +00:00

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:42:43 +00:00

cdr.conf.sample

Merged revisions 113874 via svnmerge from

2008-04-09 19:00:40 +00:00

chan_dahdi.conf.sample

Merged revisions 207095 via svnmerge from

2009-07-17 19:18:14 +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

dbsep.conf.sample

Add contributed script for separation of database access from Asterisk

2008-03-11 20:58:42 +00:00

dnsmgr.conf.sample

…

dsp.conf.sample

Create a centralized configuration option for silencethreshold

2008-03-05 16:23:44 +00:00

dundi.conf.sample

Update dundi.conf to indicate that the asterisk.conf entityid option can be used

2008-06-10 12:50:07 +00:00

enum.conf.sample

Merged revisions 81379 via svnmerge from

2007-08-30 15:34:18 +00:00

extconfig.conf.sample

Merged revisions 212857 via svnmerge from

2009-08-18 19:27:06 +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-12 17:27:55 +00:00

extensions.conf.sample

Merged revisions 229966 via svnmerge from

2009-11-13 17:21:26 +00:00

extensions.lua.sample

Merged revisions 144523 via svnmerge from

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

features.conf.sample

Merged revisions 186175 via svnmerge from

2009-04-02 21:59:44 +00:00

festival.conf.sample

…

followme.conf.sample

Merged revisions 81453 via svnmerge from

2007-09-04 19:56:46 +00:00

func_odbc.conf.sample

Eliminate mention of a variable which exists only in trunk.

2009-02-16 17:07:57 +00:00

gtalk.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

h323.conf.sample

HUGE improvements to QoS/CoS handling by IgorG

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

http.conf.sample

Update sample configuration to match what are now the defaults for the prefix.

2008-06-26 01:11:43 +00:00

iax.conf.sample

Merged revisions 233280 via svnmerge from

2009-12-04 21:55:53 +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:53 +00:00

jabber.conf.sample

Minor text fix. roster -> resource.

2008-05-22 15:49:17 +00:00

jingle.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

logger.conf.sample

Merged revisions 194765 via svnmerge from

2009-05-15 18:44:09 +00:00

manager.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

meetme.conf.sample

Revert my change to the sample meetme conf file as it was incorrect.

2008-06-22 17:36:20 +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 02:09:13 +00:00

modules.conf.sample

Merged revisions 198186 via svnmerge from

2009-05-29 23:05:14 +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-12 17:27:55 +00:00

osp.conf.sample

…

oss.conf.sample

fix example configuration for video support in chan_oss

2008-05-19 14:54:34 +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:06:12 +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:30 +00:00

res_odbc.conf.sample

Merged revisions 170837 via svnmerge from

2009-01-24 13:57:20 +00:00

res_pgsql.conf.sample

Merge the adaptive realtime branch, which will make adding new required fields

2008-06-05 19:07:27 +00:00

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-12 17:27:55 +00:00

rtp.conf.sample

Merged revisions 144829 via svnmerge from

2008-09-26 23:16:42 +00:00

say.conf.sample

…

sip_notify.conf.sample

Merged revisions 146312 via svnmerge from

2008-10-04 01:57:45 +00:00

sip.conf.sample

Merged revisions 235298 via svnmerge from

2009-12-16 16:27:27 +00:00

skinny.conf.sample

Move implementation of an attended-transfer-complete sound from one channel

2008-07-30 16:40:43 +00:00

sla.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:10 +00:00

smdi.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:10 +00:00

telcordia-1.adsi

…

udptl.conf.sample

Merged revisions 222110 via svnmerge from

2009-10-05 19:53:18 +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

Allow alternative extensions to be specified for a user.

2008-06-19 19:22:59 +00:00

voicemail.conf.sample

Merged revisions 218361 via svnmerge from

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

vpb.conf.sample

Merged revisions 197089 via svnmerge from

2009-05-27 16:12:10 +00:00