MERGE branches/concurrency 108301:108557 into trunk
authorIan Baker <raindrift@users.mediawiki.org>
Tue, 10 Jan 2012 23:03:03 +0000 (23:03 +0000)
committerIan Baker <raindrift@users.mediawiki.org>
Tue, 10 Jan 2012 23:03:03 +0000 (23:03 +0000)
commitb3c84ce26193306d4397febfd13eb9e0db3ea734
tree566fea2574047ce285b384fa706951ea287649b8
parent3938093e95c47129b59d6c465fd535b48ce38f6a
MERGE branches/concurrency 108301:108557 into trunk
includes/AutoLoader.php
includes/ConcurrencyCheck.php [new file with mode: 0644]
includes/DefaultSettings.php
includes/api/ApiConcurrency.php [new file with mode: 0644]
includes/api/ApiMain.php
includes/installer/MysqlUpdater.php
maintenance/archives/patch-concurrencycheck.sql [new file with mode: 0644]
maintenance/tables.sql
tests/phpunit/includes/ConcurrencyCheckTest.php [new file with mode: 0644]
tests/phpunit/includes/api/ApiConcurrencyTest.php [new file with mode: 0644]