Merge branch 'binaryAPI' of git://github.com/yaourt/jedis

Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java

src/main/java/redis/clients/jedis/ShardedJedis.java

@@ -1,17 +1,16 @@
 package redis.clients.jedis;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import redis.clients.jedis.Client.LIST_POSITION;
+import redis.clients.jedis.BinaryClient.LIST_POSITION;
 import redis.clients.util.Hashing;
-import redis.clients.util.Sharded;
 
-public class ShardedJedis extends Sharded<Jedis, JedisShardInfo> implements
-        JedisCommands {
+public class ShardedJedis extends BinaryShardedJedis implements JedisCommands {
     public ShardedJedis(List<JedisShardInfo> shards) {
         super(shards);
     }
@@ -161,12 +160,12 @@ public class ShardedJedis extends Sharded<Jedis, JedisShardInfo> implements
         return j.hlen(key);
     }
 
-    public List<String> hkeys(String key) {
+    public Set<String> hkeys(String key) {
         Jedis j = getShard(key);
         return j.hkeys(key);
     }
 
-    public List<String> hvals(String key) {
+    public Collection<String> hvals(String key) {
         Jedis j = getShard(key);
         return j.hvals(key);
     }
@@ -368,10 +367,4 @@ public class ShardedJedis extends Sharded<Jedis, JedisShardInfo> implements
         Jedis j = getShard(key);
         return j.linsert(key, where, pivot, value);
     }
-
-    public List<Object> pipelined(ShardedJedisPipeline shardedJedisPipeline) {
-        shardedJedisPipeline.setShardedJedis(this);
-        shardedJedisPipeline.execute();
-        return shardedJedisPipeline.getResults();
-    }
 }