summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--redis/__init__.py2
-rw-r--r--tests/connection_pool.py2
3 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 8377a72..e5c8df4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* 2.4.12
+ * ConnectionPool is now fork-safe. Thanks Josiah Carson for the patch.
* 2.4.11
* AuthenticationError will now be correctly raised if an invalid password
is supplied.
diff --git a/redis/__init__.py b/redis/__init__.py
index ec1db1b..8fbff1d 100644
--- a/redis/__init__.py
+++ b/redis/__init__.py
@@ -16,7 +16,7 @@ from redis.exceptions import (
)
-__version__ = '2.4.11'
+__version__ = '2.4.12'
VERSION = tuple(map(int, __version__.split('.')))
__all__ = [
diff --git a/tests/connection_pool.py b/tests/connection_pool.py
index 8252cee..54cbf05 100644
--- a/tests/connection_pool.py
+++ b/tests/connection_pool.py
@@ -1,9 +1,11 @@
+import os
import redis
import unittest
class DummyConnection(object):
def __init__(self, **kwargs):
self.kwargs = kwargs
+ self.pid = os.getpid()
class ConnectionPoolTestCase(unittest.TestCase):
def get_pool(self, connection_info=None, max_connections=None):