Merge branch 'variadic' of git://github.com/ivowiblo/jedis into variadic

Conflicts: src/main/java/redis/clients/jedis/BinaryClient.java src/main/java/redis/clients/jedis/BinaryJedis.java src/main/java/redis/clients/jedis/BinaryShardedJedis.java src/main/java/redis/clients/jedis/Client.java src/main/java/redis/clients/jedis/Commands.java src/main/java/redis/clients/jedis/Jedis.java src/main/java/redis/clients/jedis/ShardedJedis.java
2012-04-23 21:00:29 -03:00
parent 3da2f2dd57 dd88c51db8
commit 05503212aa
13 changed files with 976 additions and 730 deletions
--- a/src/test/java/redis/clients/jedis/tests/commands/SlowlogCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/SlowlogCommandsTest.java
@@ -11,6 +11,7 @@ public class SlowlogCommandsTest extends JedisCommandTestBase {
    @Test
    public void slowlog() {
    	//do something
+	jedis.configSet("slowlog-log-slower-than", "0");
    	jedis.set("foo", "bar");
    	jedis.set("foo2", "bar2");