From aed6f867820014332e733765003391beb958c589 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 27 Dec 2016 14:36:53 +0100
Subject: [PATCH] fix merge

---
 src/Symfony/Component/Cache/Adapter/RedisAdapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
index d0d3b72e50..3a59e837ee 100644
--- a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
@@ -26,7 +26,7 @@ class RedisAdapter extends AbstractAdapter
         'class' => null,
         'persistent' => 0,
         'timeout' => 30,
-        'read_timeout' => 30,
+        'read_timeout' => 0,
         'retry_interval' => 0,
     );
     private $redis;