Merge "objectcache: make RedisBagOStuff pass all tests"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Sat, 2 Jun 2018 01:35:26 +0000 (01:35 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 2 Jun 2018 01:35:26 +0000 (01:35 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 2 Jun 2018 01:35:26 +0000 (01:35 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 2 Jun 2018 01:35:26 +0000 (01:35 +0000)
diff --cc includes/libs/objectcache/BagOStuff.php
Simple merge
diff --cc includes/libs/objectcache/RedisBagOStuff.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sat, 2 Jun 2018 01:35:26 +0000 (01:35 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 2 Jun 2018 01:35:26 +0000 (01:35 +0000)
		1	2
includes/libs/objectcache/BagOStuff.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/libs/objectcache/RedisBagOStuff.php	patch \|	diff1 \|	diff2 \|	blob \| history