rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
775 Commits 2 Branches 0 Tags
4ca3596df1e82b2cbf62f932035a2df6707e1e0d
Commit Graph

775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos Nils
4ca3596df1 Merge branch 'PumpkinJack-master' 2014-05-25 16:44:45 -03:00
Marcos Nils
f3834e1a1b Merge branch 'master' of https://github.com/PumpkinJack/jedis into PumpkinJack-master 2014-05-25 16:43:33 -03:00
Marcos Nils
e0cf204fc4 Merge branch 'HeartSaVioR-introduce-undocumented-jedis-cluster-commands' 2014-05-25 16:31:00 -03:00
Marcos Nils
1782aaeeb1 Manual merge of #581 2014-05-25 16:30:41 -03:00
Marcos Nils
d8c3629fde Merge branch 'etreworgy-impl-incrbyfloat' 2014-05-25 15:32:45 -03:00
Marcos Nils
50052e90ad Manually merge #400 2014-05-25 15:32:12 -03:00
Marcos Nils
0d5062c347 Merge branch 'master' of github.com:xetorthio/jedis 2014-05-25 15:23:59 -03:00
Marcos Nils
a21d1fae37 Merge branch 'HeartSaVioR-expose-scan-commands-to-binary-jedis' 2014-05-25 15:22:38 -03:00
Marcos Nils
3131279b5b Manually merge with #574 2014-05-25 15:22:20 -03:00
Marcos Nils
213d186c8d Merge pull request #576 from aniketschneider/pexpire-long-with-deprecation 
Accept long parameter for pexpire
 2014-05-25 21:12:33 +03:00
Marcos Nils
6106f5bbe6 Manually merge #578 to master 2014-05-25 15:01:24 -03:00
Jonathan Leibiusky
bc9e49d6c9 Merge pull request #571 from rherget/master 
add a returnBrokenResource method to ShardedJedisPool
 2014-05-25 13:36:27 -04:00
Marcos Nils
20d1450124 Merge pull request #622 from mindwind/master 
ScanParams should be return this reference for chain code style like SortingParams
 2014-05-25 20:34:30 +03:00
Jonathan Leibiusky
8f52dc743f Merge pull request #615 from xetorthio/hll-resurrect-afefb71e57b0258a52b465b2b4e57c132aef4db9 
Support for HLL
 2014-05-25 13:34:13 -04:00
Marcos Nils
c17a228b45 Merge pull request #637 from HeartSaVioR/fix-cluster-nodes-parse-error 
fix "cluster nodes" parse error when slot is in transition (fixes #635)
 2014-05-25 20:32:28 +03:00
Jonathan Leibiusky
aca1b32f6e Merge pull request #641 from Lolecule/set_nxxx_expx_on_jedis_cluster 
Added Set NXXX and EXPX options for JedisCluster and ShardedJedis
 2014-05-25 13:31:36 -04:00
Steve Parrington
742e83b1e0 Added override annotation to ShardedJedis.set() 2014-05-22 11:29:55 +01:00
Steve Parrington
51de5f72ab Added Set NXXX and EXPX options for JedisCluster and ShardedJedis 2014-05-21 16:09:47 +01:00
Jungtaek Lim
7255a8cae1 fix "cluster nodes" parse error when slot is in transition 
* extract cluster nodes info. parser from JedisClusterConnectionHandler
* unit test for migrating slot included
 2014-05-21 08:08:12 +09:00
PumpkinJack
942fc1d77b add the time() method 2014-05-04 15:15:21 +08:00
PumpkinJack
e17a312d92 To solving the error (at Pool.java 35 : The type 
org.apache.commons.pool2.impl.AbandonedConfig cannot be resolved. It is
indirectly referenced from required .class files), we update
common-pool2 (2.0 -> 2.2)
 2014-05-04 15:03:18 +08:00
PumpkinJack
c63e901232 add 'time()' method to MultiKeyPipellineBase 2014-05-03 17:25:10 +08:00
Jungtaek Lim
6485a7ec08 Add Binary Pipeline version of pfcount 2014-04-30 08:17:59 +09:00
Jungtaek Lim
219f9b3716 Merge pull request #627 from aloksingh/hll-pfcount-with-multiple-keys 
Add support for pfcount with multiple keys
 2014-04-30 06:54:22 +09:00
Alok Singh
d9d039d060 Added pfcount(keys) to BinaryJedis interfaces 2014-04-29 08:58:15 -07:00
Alok Singh
b633024c11 Move pfcount(keys) method to multikey interfaces 2014-04-28 16:41:09 -07:00
Alok Singh
cd722e5a82 Add support for pfcount with multiple keys 2014-04-28 14:17:46 -07:00
mindwind
69de8d84d5 fix - ScanParams should be return this reference 
build pattern for chain code style
 2014-04-24 10:58:57 +08:00
Jungtaek Lim
986acc8c9e Revert "Revert "Add support for HLL"" 
This reverts commit ac53759f97.

Sorry for double reverting, I should revert "merged commit", not origin commit

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
 2014-04-06 00:19:16 +09:00
Jungtaek Lim
334314d3c5 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
 2014-04-06 00:11:40 +09:00
Jungtaek Lim
c2cf79c972 Apply PF* (string, binary) commands to Pipeline 
* Apply PF* (string, binary) commands to Pipeline
* PF* Pipeline (string, binary) commands to interface
** pfadd / pfcount : BinaryRedisPipeline, RedisPipeline
** pfmerge : MultiKeyBinaryRedisPipeline, MultiKeyCommandsPipeline
 2014-04-05 23:48:49 +09:00
Jungtaek Lim
11f05ec161 Apply binary PF* commands to BinaryJedis, BinaryShardedJedis 
* Apply binary PF* commands to BinaryJedis, BinaryShardedJedis
* binary PF* commands to interface
** pfadd / pfcount : BinaryJedisCommands
** pfmerge : MultiKeyBinaryCommands
 2014-04-05 23:21:47 +09:00
Jungtaek Lim
1345b5c1da Apply PF* commands to JedisCluster, ShardedJedis 
* Apply PF* commands to JedisCluster, ShardedJedis
* PF* commands to interface
** pfadd / pfcount : JedisCommands
** pfmerge : MultiKeyCommands
 2014-04-05 22:19:11 +09:00
Jungtaek Lim
ac53759f97 Revert "Add support for HLL" 
This reverts commit afefb71e57.
 2014-04-05 18:46:06 +09:00
Jungtaek Lim
96591a1528 Merge pull request #613 from xetorthio/hll 
Add support for HLL commands
 2014-04-05 18:35:07 +09:00
Jungtaek Lim
a3345f5a17 Merge pull request #612 from vijaykramesh/sentinel_pool_null_check_on_broken 
handle nulls in JedisSentinelPool#return[Broken]Resource
 2014-04-04 11:23:31 +09:00
Marcos Nils
a6b76ae665 Remove RedisTimeout that was added accidentally 2014-04-03 22:05:40 -03:00
Marcos Nils
afefb71e57 Add support for HLL 2014-04-03 22:01:15 -03:00
Vijay Ramesh
ce1156be44 JedisSentinelPool#return[Broken]Resource should handle nulls the same was as JedisPool 2014-04-03 16:44:35 -07:00
Marcos Nils
752973de12 Merge pull request #605 from HeartSaVioR/fix-readme-with-invalid-download-link 
Fix invalid link to download (it's deprecated) - replace to releases
 2014-03-27 11:38:34 -03:00
Jungtaek Lim
b7db408a67 Fix invalid link to download (it's deprecated) - replace to releases 2014-03-27 23:33:00 +09:00
Jungtaek Lim
e7bc4f5d65 Merge pull request #601 from HeartSaVioR/master 
Reflect recent version to maven dependency explain
 2014-03-22 18:37:40 +09:00
Jungtaek Lim
d7f88789ea Reflect recent version to maven dependency explain 2014-03-22 18:00:34 +09:00
Jonathan Leibiusky
bcd40b4e34 [maven-release-plugin] prepare for next development iteration 2014-03-12 13:14:51 -04:00
Jonathan Leibiusky
70fa35f3ba [maven-release-plugin] prepare release jedis-2.4.2 2014-03-12 13:14:49 -04:00
Jonathan Leibiusky
d00e8b6444 revert back version 2014-03-12 13:13:48 -04:00
Jonathan Leibiusky
ec03c0940e [maven-release-plugin] prepare for next development iteration 2014-03-12 10:44:02 -04:00
Jonathan Leibiusky
e449923ec0 [maven-release-plugin] prepare release jedis-2.4.2 2014-03-12 10:44:00 -04:00
Jonathan Leibiusky
12ab600dee Merge pull request #549 from HeartSaVioR/make_multi_in_pipeline_and_sync_work_smoothly 
Fix multi in Pipeline and sync() - JedisDataException (fixes #547)
 2014-03-12 10:41:51 -04:00
Jonathan Leibiusky
0c16cbde8b Merge pull request #587 from xetorthio/null-check 
add a number of null check to return methods.
 2014-03-12 10:36:33 -04:00