http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97490
Revision: 97490
Author: reedy
Date: 2011-09-19 13:45:46 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Commenting out r81460, there's too much merge info rubbish and stuff
Modified Paths:
--------------
trunk/tools/make-wmf-branch/default.conf
Modified: trunk/tools/make-wmf-branch/default.conf
===================================================================
--- trunk/tools/make-wmf-branch/default.conf 2011-09-19 13:35:07 UTC (rev
97489)
+++ trunk/tools/make-wmf-branch/default.conf 2011-09-19 13:45:46 UTC (rev
97490)
@@ -142,10 +142,8 @@
$patches = array(
// NOTE: r81460 is a big rev
// memcached->APC in LanguageConverter. TODO: Ask Tim if this is needed
- array( 'rev' => 81460, 'base' => '^/branches/wmf/1.17wmf1' ),
-
// Reduce cache size for RepoGroup cache
- array( 'rev' => 81460, 'base' => '^/branches/wmf/1.17wmf1' ),
+ // array( 'rev' => 81460, 'base' => '^/branches/wmf/1.17wmf1' ),
// Is this still needed?
// Protect against fatals in Profiler.php
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
