[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: Call destroy method that actually exists instead of one that...

2016-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Call destroy method that actually exists instead of one that 
doesn't anymore.
..


Call destroy method that actually exists instead of one that doesn't anymore.

Bug: T147881
Change-Id: Idac48d3c022af60409df37f2b1fcf82af814bdfa
---
M includes/ForkController.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ForkController.php b/includes/ForkController.php
index 2725753..da4cd17 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -150,7 +150,7 @@
protected function prepareEnvironment() {
global $wgMemc;
// Don't share DB, storage, or memcached connections
-   wfGetLBFactory()->destroyInstance();
+   wfGetLBFactory()->destroy();
FileBackendGroup::destroySingleton();
LockManagerGroup::destroySingletons();
JobQueueGroup::destroySingletons();

-- 
To view, visit https://gerrit.wikimedia.org/r/315332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idac48d3c022af60409df37f2b1fcf82af814bdfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: Call destroy method that actually exists instead of one that...

2016-10-11 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315332

Change subject: Call destroy method that actually exists instead of one that 
doesn't anymore.
..

Call destroy method that actually exists instead of one that doesn't anymore.

Bug: T147881
Change-Id: Idac48d3c022af60409df37f2b1fcf82af814bdfa
---
M includes/ForkController.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/315332/1

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 2725753..da4cd17 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -150,7 +150,7 @@
protected function prepareEnvironment() {
global $wgMemc;
// Don't share DB, storage, or memcached connections
-   wfGetLBFactory()->destroyInstance();
+   wfGetLBFactory()->destroy();
FileBackendGroup::destroySingleton();
LockManagerGroup::destroySingletons();
JobQueueGroup::destroySingletons();

-- 
To view, visit https://gerrit.wikimedia.org/r/315332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idac48d3c022af60409df37f2b1fcf82af814bdfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits