dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LoadMonitor: Avoid "host not replicating?" log messages by checking "is static"
[lhc/web/wiklou.git]
/
includes
/
MergeHistory.php
diff --git
a/includes/MergeHistory.php
b/includes/MergeHistory.php
index
441fe9e
..
f797fe3
100644
(file)
--- a/
includes/MergeHistory.php
+++ b/
includes/MergeHistory.php
@@
-33,7
+33,7
@@
*/
class MergeHistory {
*/
class MergeHistory {
- /** @const int Maximum number of revisions that can be merged at once
(avoid too much slave lag)
*/
+ /** @const int Maximum number of revisions that can be merged at once */
const REVISION_LIMIT = 5000;
/** @var Title Page from which history will be merged */
const REVISION_LIMIT = 5000;
/** @var Title Page from which history will be merged */
@@
-42,7
+42,7
@@
class MergeHistory {
/** @var Title Page to which history will be merged */
protected $dest;
/** @var Title Page to which history will be merged */
protected $dest;
- /** @var
DatabaseB
ase Database that we are using */
+ /** @var
IDatab
ase Database that we are using */
protected $dbw;
/** @var MWTimestamp Maximum timestamp that we can use (oldest timestamp of dest) */
protected $dbw;
/** @var MWTimestamp Maximum timestamp that we can use (oldest timestamp of dest) */