r110857 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110856‎ | r110857 | r110858 >
Date:17:07, 7 February 2012
Author:reedy
Status:ok
Tags:
Comment:
Merge r109759, r106284

Fix whitespace
Modified paths:
  • /trunk/extensions/WikimediaMaintenance (modified) (history)
  • /trunk/extensions/WikimediaMaintenance/addWiki.php (modified) (history)
  • /trunk/extensions/WikimediaMaintenance/jobs-loop.sh (modified) (history)

Diff [purge]

Index: trunk/extensions/WikimediaMaintenance/addWiki.php
@@ -171,7 +171,8 @@
172172
173173 $this->output( "Script ended. You still have to:
174174 * Add any required settings in InitialiseSettings.php
175 - * Run sync-common-all"
 175+ * Run sync-common-all
 176+"
176177 );
177178 }
178179
Index: trunk/extensions/WikimediaMaintenance/jobs-loop.sh
@@ -1,13 +1,15 @@
22 #!/bin/bash
33
 4+ulimit -v 400000
 5+
46 trap 'kill %-; exit' SIGTERM
57 [ ! -z "$1" ] && {
6 - echo "starting type-specific job runner: $1"
7 - type=$1
 8+ echo "starting type-specific job runner: $1"
 9+ type=$1
810 }
911
1012 #types="htmlCacheUpdate sendMail enotifNotify uploadFromUrl fixDoubleRedirect renameUser"
11 -types="sendMail enotifNotify uploadFromUrl fixDoubleRedirect"
 13+types="sendMail enotifNotify uploadFromUrl fixDoubleRedirect MoodBarHTMLMailerJob"
1214
1315 cd `readlink -f /usr/local/apache/common/multiversion`
1416 while [ 1 ];do
Property changes on: trunk/extensions/WikimediaMaintenance/jobs-loop.sh
___________________________________________________________________
Modified: svn:mergeinfo
1517 Merged /branches/wmf/1.18wmf1/maintenance/jobs-loop.sh:r106284,109759
Property changes on: trunk/extensions/WikimediaMaintenance
___________________________________________________________________
Added: svn:mergeinfo
1618 Merged /branches/wmf/1.18wmf1/maintenance:r106284,109759

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r106284Add MoodBarHTMLMailerJob as a prioritized job type. This really needs to be m...catrope23:57, 14 December 2011
r109759em ulimit livehackmidom21:26, 22 January 2012

Status & tagging log