Skip to content

Commit

Permalink
Sets timeout correctly for JedisCluster. Fixes #602.
Browse files Browse the repository at this point in the history 
Removes unused JedisCluster timeout parameter and now it's passed
all the way up to the creation of the JedisPool.

Conflicts:
	src/main/java/redis/clients/jedis/JedisCluster.java
	src/main/java/redis/clients/jedis/JedisPoolAbstract.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisTest.java
  • Loading branch information
@marcosnils @HeartSaVioR
marcosnils authored and HeartSaVioR committed Mar 27, 2015
1 parent 2e9dc09 commit 74ff7ae
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 149 deletions.
Loading

0 comments on commit 74ff7ae

Please sign in to comment.