Merged revisions 57089 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 28 Feb 2007 18:21:47 +0000 (18:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 28 Feb 2007 18:21:47 +0000 (18:21 +0000)
commit4fd59356efeede863ab5d385d12518f85565d685
tree260e8969cd54aef7512f6cdc724ffbf20d83e39f
parent4f149bdcb413600bba5a9ec45951ae6bed7ae274
Merged revisions 57089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57089 | russell | 2007-02-28 12:20:05 -0600 (Wed, 28 Feb 2007) | 8 lines

Merge current set of changes from svn/asterisk/team/russell/sla_updates

* Add support for station ring delays.  Ring delays can be set globally for a
  station or for specific trunks on the station.
* Fix a few bugs in existing code.
* Restructure and Reorganize code to improve readability and maintainability.
* Improve formatting of the "sla show (trunks|stations)" CLI commands.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c
configs/sla.conf.sample