| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | | -# You can override variables in this file by creating a file in the same |
| | 4 | +# You can override variables in this file by creating a file in the same |
| 5 | 5 | # directory called local.conf |
| 6 | 6 | |
| 7 | 7 | $normalExtensions = array( |
| — | — | @@ -100,7 +100,6 @@ |
| 101 | 101 | $specialExtensions = array( |
| 102 | 102 | 'LiquidThreads_alpha' => '^/branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha', |
| 103 | 103 | 'LiquidThreads' => '^/branches/wmf/1.16wmf4/extensions/LiquidThreads', |
| 104 | | - 'ArticleAssessmentPilot' => '^/branches/wmf/1.16wmf4/extensions/ArticleAssessmentPilot', |
| 105 | 104 | 'CentralNotice' => '^/branches/wmf/1.16wmf4/extensions/CentralNotice', |
| 106 | 105 | 'ContributionReporting' => '^/branches/wmf/1.16wmf4/extensions/ContributionReporting', |
| 107 | 106 | 'ContributionTracking' => '^/branches/wmf/1.16wmf4/extensions/ContributionTracking', |
| — | — | @@ -133,16 +132,16 @@ |
| 134 | 133 | |
| 135 | 134 | // memcached->APC in LanguageConverter. TODO: Ask Tim if this is needed |
| 136 | 135 | array( 'rev' => 60970, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 137 | | - |
| | 136 | + |
| 138 | 137 | // Suppress logging DB reconnections if more than 5 mins have elapsed |
| 139 | 138 | array( 'rev' => 67177, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 140 | | - |
| | 139 | + |
| 141 | 140 | // Reduce cache size for RepoGroup cache |
| 142 | 141 | array( 'rev' => 69199, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 143 | | - |
| | 142 | + |
| 144 | 143 | // Protect against fatals in Profiler.php |
| 145 | 144 | array( 'rev' => 76243, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 146 | | - |
| | 145 | + |
| 147 | 146 | // thumb.php hack for thumbs of temp files |
| 148 | 147 | array( 'rev' => 77266, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 149 | 148 | ); |