Merged revisions 7285,7299,7310,7329 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Sun, 4 Dec 2005 18:12:52 +0000 (18:12 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sun, 4 Dec 2005 18:12:52 +0000 (18:12 +0000)
commitb6b32ebd9148b30dd2c3899237a6bb3ca3bd7c1a
treed95357a9f252222bdd4d6363e1456765b0ef46fc
parent82a4d5dd8fafe76ee2e932a0595812e05df0dfc9
Merged revisions 7285,7299,7310,7329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7285 | tilghman | 2005-12-02 15:12:05 -0600 (Fri, 02 Dec 2005) | 2 lines

Turn on executable bits for startup scripts, and fix bash var interpolation for Mandrake

........
r7299 | oej | 2005-12-02 19:24:40 -0600 (Fri, 02 Dec 2005) | 2 lines

Documenting the default registerattempts setting as 0, continue hammering the server for ever and ever ;-)

........
r7310 | tilghman | 2005-12-03 13:55:05 -0600 (Sat, 03 Dec 2005) | 3 lines

Bug 5925: check for "Unknown", as that's what app_voicemail puts into the field for Unknown callerid
Also, remove useless res checks (initialized to 0; never set)

........
r7329 | kpfleming | 2005-12-04 12:03:07 -0600 (Sun, 04 Dec 2005) | 2 lines

use a more efficient way to get the revision number, that will also report if the working copy contains uncommitted modifications

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
build_tools/make_svn_branch_name
configs/sip.conf.sample
contrib/init.d/rc.debian.asterisk [changed mode: 0644->0755]
contrib/init.d/rc.gentoo.asterisk [changed mode: 0644->0755]
contrib/init.d/rc.mandrake.asterisk [changed mode: 0644->0755]
contrib/init.d/rc.mandrake.zaptel [changed mode: 0644->0755]
contrib/init.d/rc.redhat.asterisk [changed mode: 0644->0755]
contrib/init.d/rc.slackware.asterisk [changed mode: 0644->0755]