From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 18 Mar 2013 16:57:23 +0000 (-0700)
Subject: Moved some RedisConnectionPool docs to the factory function.
X-Git-Tag: 1.31.0-rc.0~20287
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=5131bbadd1a7b9a0ca21b6e0a5e2f96959f5400d;p=lhc%2Fweb%2Fwiklou.git

Moved some RedisConnectionPool docs to the factory function.

Change-Id: I4183b96e123882de604de1484456abcd10091fb2
---

diff --git a/includes/clientpool/RedisConnectionPool.php b/includes/clientpool/RedisConnectionPool.php
index 5c7c4f20b5..a15e80ba80 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -55,14 +55,6 @@ class RedisConnectionPool {
 	const SERVER_DOWN_TTL = 30; // integer; seconds to cache servers as "down"
 
 	/**
-	 * $options include:
-	 *   - connectTimeout : The timeout for new connections, in seconds.
-	 *                      Optional, default is 1 second.
-	 *   - persistent     : Set this to true to allow connections to persist across
-	 *                      multiple web requests. False by default.
-	 *   - password       : The authentication password, will be sent to Redis in clear text.
-	 *                      Optional, if it is unspecified, no AUTH command will be sent.
-	 *   - serializer     : Set to "php", "igbinary", or "none". Default is "php".
 	 * @param array $options
 	 */
 	protected function __construct( array $options ) {
@@ -103,6 +95,14 @@ class RedisConnectionPool {
 
 	/**
 	 * @param $options Array
+	 * $options include:
+	 *   - connectTimeout : The timeout for new connections, in seconds.
+	 *                      Optional, default is 1 second.
+	 *   - persistent     : Set this to true to allow connections to persist across
+	 *                      multiple web requests. False by default.
+	 *   - password       : The authentication password, will be sent to Redis in clear text.
+	 *                      Optional, if it is unspecified, no AUTH command will be sent.
+	 *   - serializer     : Set to "php", "igbinary", or "none". Default is "php".
 	 * @return RedisConnectionPool
 	 */
 	public static function singleton( array $options ) {