[asterisk-commits] lmadsen: branch 1.8 r324240 - in /branches/1.8: configs/ contrib/scripts/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Jun 20 13:11:09 2011
New Revision: 324240

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324240
Log:
Revert previous merge which had extra changes.

Modified:
    branches/1.8/configs/queuerules.conf.sample
    branches/1.8/contrib/scripts/asterisk.logrotate

Modified: branches/1.8/configs/queuerules.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/queuerules.conf.sample?view=diff&rev=324240&r1=324239&r2=324240
==============================================================================
--- branches/1.8/configs/queuerules.conf.sample (original)
+++ branches/1.8/configs/queuerules.conf.sample Mon Jun 20 13:11:09 2011
@@ -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]

Modified: branches/1.8/contrib/scripts/asterisk.logrotate
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/contrib/scripts/asterisk.logrotate?view=diff&rev=324240&r1=324239&r2=324240
==============================================================================
--- branches/1.8/contrib/scripts/asterisk.logrotate (original)
+++ branches/1.8/contrib/scripts/asterisk.logrotate Mon Jun 20 13:11:09 2011
@@ -5,8 +5,6 @@
 	compress
 	delaycompress
 	notifempty
-	#
-	# make sure the user and group matches what Asterisk is running as
 	create 640 root root 
 	sharedscripts
 	postrotate