From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 2 Dec 2015 22:41:43 +0000 (+0000)
Subject: Merge "Fix relayPurge() IDEA warnings"
X-Git-Tag: 1.31.0-rc.0~8835
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=cd42bfbe24c81f55c99f6fabf835d248823c8cc6;hp=984ea740aa78bd3a79928d8562c5a19b25f59a9d;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix relayPurge() IDEA warnings"
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 21d6885118..e1ac56e3a2 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -923,7 +923,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 *
 	 * @param string $key Cache key
 	 * @param integer $ttl How long to keep the tombstone [seconds]
-	 * @param holdoff $ttl HOLDOFF_* constant controlling how long to ignore sets for this key
+	 * @param integer $holdoff HOLDOFF_* constant controlling how long to ignore sets for this key
 	 * @return bool Success
 	 */
 	protected function relayPurge( $key, $ttl, $holdoff ) {