Merge branch 'master' into hll-resurrect-afefb71e57b0258a52b465b2b4e57c132aef4db9

it resurrects afefb71e57

Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/test/java/redis/clients/jedis/tests/commands/HyperLogLogCommandsTest.java
This commit is contained in:
Jungtaek Lim
2014-04-06 00:11:40 +09:00
5 changed files with 35 additions and 17 deletions

View File

@@ -320,7 +320,7 @@ public class BinaryClient extends Connection {
public void sadd(final byte[] key, final byte[]... members) {
sendCommand(SADD, joinParameters(key, members));
}
public void smembers(final byte[] key) {
sendCommand(SMEMBERS, key);
}