From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 24 May 2012 10:49:00 +0000 (+0200)
Subject: make Wikidata the default branch for git-review
X-Git-Tag: 1.31.0-rc.0~22097^2^2~156
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=2f9927e9d981d948d8da41ac9bf20a83bc1669e9;p=lhc%2Fweb%2Fwiklou.git

make Wikidata the default branch for git-review
---

diff --git a/.gitreview b/.gitreview
index 46f67145ad..3b2aa76b2c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=master
-defaultrebase=0
\ No newline at end of file
+defaultbranch=Wikidata
+defaultrebase=0
diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index f286fa1187..ddce5c5db9 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -11,7 +11,7 @@
 		 timeoutForSmallTests="2"
 		 timeoutForMediumTests="10"
 		 timeoutForLargeTests="60"
-         strict="true"
+         strict="false"
 		 verbose="true">
 	<testsuites>
 		<testsuite name="includes">