Merge branch 'cluster' of github.com:marcosnils/jedis into marcosnils-cluster

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
2014-01-16 16:35:04 -05:00
parent 46734e646a 6c8d7a5045
commit 842dcd2a95
25 changed files with 2513 additions and 80 deletions
--- a/src/main/java/redis/clients/jedis/BinaryClient.java
+++ b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -1135,4 +1135,11 @@ public class BinaryClient extends Connection {
    public void waitReplicas(int replicas, long timeout) {
 	sendCommand(WAIT, toByteArray(replicas), toByteArray(timeout));
    }
+
+    public void cluster(final byte[]... args) {
+    	sendCommand(CLUSTER, args);
+    }
+    public void asking() {
+    	sendCommand(Command.ASKING);
+    }
 }