Merge branch 'master' into cluster-revised

Author: HeartSaVioR

build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'maven'
 apply plugin: 'eclipse'
 
 group = 'com.googlecode.jedis'
-archiveBaseName = 'jedis'
+archivesBaseName = 'jedis'
 version = '1.5.0'
 
 repositories {

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

@@ -1116,8 +1116,8 @@ public String lpop(final String key) {
 
     /**
      * Atomically return and remove the first (LPOP) or last (RPOP) element of
-     * the list. For example if the list contains the elements "a","b","c" LPOP
-     * will return "a" and the list will become "b","c".
+     * the list. For example if the list contains the elements "a","b","c" RPOP
+     * will return "c" and the list will become "a","b".
      * <p>
      * If the key does not exist or the list is already empty the special value
      * 'nil' is returned.

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

@@ -384,7 +384,7 @@ public Long hlen(final String key) {
 		maxRedirections) {
 	    @Override
 	    public Long execute(Jedis connection) {
-		return connection.hdel(key);
+		return connection.hlen(key);
 	    }
 	}.run(key);
     }