Jonathan Leibiusky
18652b906b
Merge branch 'speed-up-unit-test' of github.com:HeartSaVioR/jedis into upgrade_libs
Conflicts:
src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java
src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
src/test/java/redis/clients/jedis/tests/benchmark/PoolBenchmark.java
src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java