From: Leif Madsen Date: Mon, 20 Jun 2011 18:11:09 +0000 (+0000) Subject: Revert previous merge which had extra changes. X-Git-Tag: 1.8.5-rc1~11^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186eeac9f41d4d4783ae492720ff17009270dc4c;p=thirdparty%2Fasterisk.git Revert previous merge which had extra changes. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324240 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/queuerules.conf.sample b/configs/queuerules.conf.sample index fb2a1ba879..ccabe2cfa4 100644 --- a/configs/queuerules.conf.sample +++ b/configs/queuerules.conf.sample @@ -7,7 +7,7 @@ ; ; Note: There is a limitation to these rules; a caller will follow the penaltychange rules for ; the queue that were defined at the time the caller entered the queue. If an update to the rules is -; made during the caller's stay in the queue, these will not be reflected for that caller. +; made during the the caller's stay in the queue, these will not be reflected for that caller. ; ; The syntax for these rules is ; penaltychange => ,[,absolute or relative change to QUEUE_MIN_PENALTY] diff --git a/contrib/scripts/asterisk.logrotate b/contrib/scripts/asterisk.logrotate index 1c352e8146..92e6548e73 100644 --- a/contrib/scripts/asterisk.logrotate +++ b/contrib/scripts/asterisk.logrotate @@ -5,8 +5,6 @@ __LOGDIR__/debug __LOGDIR__/console __LOGDIR__/full __LOGDIR__/messages __LOGDIR compress delaycompress notifempty - # - # make sure the user and group matches what Asterisk is running as create 640 root root sharedscripts postrotate