diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-06-13 13:25:22 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-06-13 13:25:22 -0400 |
| commit | d3bd9fbd81334819cd4dd38b367a87a6eb2bd7e1 (patch) | |
| tree | da98e0eb6ae4a526b515db42d16a6066bfa012d1 | |
| parent | 41de5519c956edec98e9f2619c7c90840c0920e0 (diff) | |
| download | dogpile-cache-d3bd9fbd81334819cd4dd38b367a87a6eb2bd7e1.tar.gz | |
- version / changelog for pullreq 16
| -rw-r--r-- | docs/build/changelog.rst | 8 | ||||
| -rw-r--r-- | dogpile/cache/backends/redis.py | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst index 9fbf036..45e07c3 100644 --- a/docs/build/changelog.rst +++ b/docs/build/changelog.rst @@ -6,6 +6,14 @@ Changelog .. change:: :tags: feature + :pullreq: 16 + + Added new :paramref:`.RedisBackend.socket_timeout` option + on the Redis backend. Pull request courtesy + Saulius Menkevičius. + + .. change:: + :tags: feature Added support for tests to run via py.test. diff --git a/dogpile/cache/backends/redis.py b/dogpile/cache/backends/redis.py index 9766201..c5663cb 100644 --- a/dogpile/cache/backends/redis.py +++ b/dogpile/cache/backends/redis.py @@ -66,10 +66,13 @@ class RedisBackend(CacheBackend): Redis should expire it. This argument is only valid when ``distributed_lock`` is ``True``. - :param socket_timeout: float, seconds for socket timeout. Default is None (no timeout). - .. versionadded:: 0.5.0 + :param socket_timeout: float, seconds for socket timeout. + Default is None (no timeout). + + ..versionadded:: 0.5.4 + :param lock_sleep: integer, number of seconds to sleep when failed to acquire a lock. This argument is only valid when ``distributed_lock`` is ``True``. |