max_connections should default to None

2 files changed, 4 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 567e9a6..105da0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,7 +21,9 @@
       parsing large responses from the Redis server.
     * Added support for ZREVRANGEBYLEX.
     * ConnectionErrors are now raised if Redis refuses a connection due to
-      the maxclients limit being exceeded.
+      the maxclients limit being exceeded. Thanks Roman Karpovich.
+    * max_connections can now be set when instantiating client instances.
+      Thanks Ohad Perry.
 * 2.10.3
     * Fixed a bug with the bytearray support introduced in 2.10.2. Thanks
       Josh Owen.
diff --git a/redis/client.py b/redis/client.py
index 6c5eaa7..c40662f 100755
--- a/redis/client.py
+++ b/redis/client.py
@@ -401,7 +401,7 @@ class StrictRedis(object):
                  decode_responses=False, retry_on_timeout=False,
                  ssl=False, ssl_keyfile=None, ssl_certfile=None,
                  ssl_cert_reqs=None, ssl_ca_certs=None,
-                 max_connections=10000):
+                 max_connections=None):
         if not connection_pool:
             if charset is not None:
                 warnings.warn(DeprecationWarning(