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 fb2a1ba879c713ad21d18447ab61cb90f57cc64f..ccabe2cfa415f82603f0a9c8939f7e3d2acb9516 100644 (file)
--- 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 => <number of seconds into the call>,<absolute or relative change to QUEUE_MAX_PENALTY>[,absolute or relative change to QUEUE_MIN_PENALTY]

diff --git a/contrib/scripts/asterisk.logrotate b/contrib/scripts/asterisk.logrotate
index 1c352e8146eab88bab76c4def8e044cb16289b5f..92e6548e733ae42856d48bd5530db09bb0395fa7 100644 (file)
--- 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