diff options
author | Yossi Gottlieb <yossigo@gmail.com> | 2013-02-25 21:14:09 +0200 |
---|---|---|
committer | Yossi Gottlieb <yossigo@gmail.com> | 2013-02-25 21:14:09 +0200 |
commit | 1a6f05c5a00a4eef852c09256e2f664bce297e93 (patch) | |
tree | 29df53a44b82d8ebb9fa876c96cdc364e4d87677 /tests/assets/default.conf | |
parent | acb73e8a972adadd31450dca9ab8cf74cc82a029 (diff) | |
parent | 948fdb5f7d20ccd795e8750f60d205022fcee410 (diff) | |
download | redis-2.6.10-1.tar.gz |
Merge upstream 2.6.10.2.6.10-1
Diffstat (limited to 'tests/assets/default.conf')
-rw-r--r-- | tests/assets/default.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/assets/default.conf b/tests/assets/default.conf index 976852e91..c76eca3eb 100644 --- a/tests/assets/default.conf +++ b/tests/assets/default.conf @@ -35,7 +35,7 @@ port 6379 # unixsocket /tmp/redis.sock # Close the connection after a client is idle for N seconds (0 to disable) -timeout 300 +timeout 0 # Set server verbosity to 'debug' # it can be one of: |