rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unsigned_long_cursor_remove_deprecated' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_remove_deprecated

Browse Source 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisCluster.java
	src/main/java/redis/clients/jedis/ScanResult.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
This commit is contained in:
Jungtaek Lim
2014-08-12 10:07:26 +09:00
parent 26d1f4ad90 0aacd48c81
commit 5bf4a697fb
13 changed files with 10 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/redis/clients/jedis/MultiKeyCommands.java
View File

@@ -70,14 +70,6 @@ public interface MultiKeyCommands {
Long bitop(BitOP op, final String destKey, String... srcKeys);
@Deprecated
/**
* This method is deprecated due to bug (scan cursor should be unsigned long)
* And will be removed on next major release
* @see https://github.com/xetorthio/jedis/issues/531
*/
ScanResult<String> scan(int cursor);
ScanResult<String> scan(final String cursor);
String pfmerge(final String destkey, final String... sourcekeys);