Merge branch 'master' of git://github.com/hamsterready/jedis into hamsterready-master

Conflicts: src/main/java/redis/clients/jedis/BinaryClient.java src/main/java/redis/clients/jedis/Client.java src/main/java/redis/clients/jedis/Jedis.java src/main/java/redis/clients/jedis/Protocol.java
2013-01-30 10:50:58 -03:00
parent 406d52b271 69b5291f80
commit 846397d985
5 changed files with 215 additions and 2 deletions
--- a/src/main/java/redis/clients/jedis/BinaryClient.java
+++ b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -79,7 +79,7 @@ public class BinaryClient extends Connection {
    }

    public void ping() {
-	sendCommand(PING);
+	sendCommand(Command.PING);
    }

    public void set(final byte[] key, final byte[] value) {
@@ -856,4 +856,8 @@ public class BinaryClient extends Connection {

        sendCommand(BITOP, bargs);
    }
+
+    public void sentinel(final byte[]... args) {
+	sendCommand(SENTINEL, args);
+    }
 }