rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
835 Commits 2 Branches 0 Tags
9b824c3aadc94a9dcd3a3f0def24ffdab43ffb9f
Commit Graph

835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Himanshu Verma
9b824c3aad pipelined transaction response fix : indentation fix 2014-09-01 11:12:26 +05:30
Himanshu Verma
b219345761 pipelined transaction response fix 2014-08-31 16:06:33 +05:30
Jungtaek Lim
ebaba79119 Merge branch 'markus-s24-double-weights' 2014-08-30 21:03:39 +09:00
Jungtaek Lim
582d00b5ca Merge branch 'double-weights' of https://github.com/markus-s24/jedis into markus-s24-double-weights 2014-08-30 21:03:37 +09:00
Jungtaek Lim
d3d5d476e3 Merge branch 'markust push origin master-s24-master' 2014-08-29 14:20:08 +09:00
Jungtaek Lim
f6aced860a Merge branch 'master' of https://github.com/markus-s24/jedis into markus-s24-master 2014-08-29 14:19:41 +09:00
Jungtaek Lim
db6d8c0daf Merge branch 'HeartSaVioR-present-close-to-jedis-cluster' 2014-08-29 11:30:12 +09:00
Jungtaek Lim
babedd5be0 Merge branch 'present-close-to-jedis-cluster' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-present-close-to-jedis-cluster 2014-08-29 11:30:04 +09:00
Marcos Nils
3a3b73fca8 Merge pull request #718 from HeartSaVioR/pubsub-numsub-output-changed 
Follow up changes on "pubsub numsub" output (Fixes #714)
 2014-08-28 20:46:06 -03:00
Jungtaek Lim
0a094ff0b4 Implements #701, add close() to JedisCluster 2014-08-28 23:49:52 +09:00
Jungtaek Lim
431ae79ff1 Follow up changes on "pubsub numsub" output 
* String, String to String, Long
* We're avoiding to break backward compatibility
** convert Long to String so that return type is same to old type
 2014-08-28 18:14:49 +09:00
Jungtaek Lim
419f0c7d17 Merge branch '50onRed-fix-hgetall' 2014-08-28 09:38:09 +09:00
Markus Heiden
2eda9cd8fb Removed deprecated int based weights 2014-08-27 21:41:22 +02:00
Markus Heiden
ad5412d8cf Restored old method for int weights for backwards compatibility 2014-08-27 21:12:28 +02:00
Ivan Dyedov
9f4faf53ff fix binary version of hgetAll(), fixes #711 2014-08-26 11:50:56 -04:00
Markus Heiden
ae73a99a17 Adopted test to use decimal weight values 2014-08-23 19:39:19 +02:00
Markus Heiden
52ac566dd3 Changed weights from ints to doubles 2014-08-23 18:14:50 +02:00
Jungtaek Lim
c42965dcd5 Merge branch 'pipeline-and-transaction-can-handle-responses-on-their-own-status' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-pipeline-and-transaction-can-handle-responses-on-their-own-status 2014-08-13 07:18:48 +09:00
Jungtaek Lim
68a56938c1 Merge branch 'pipeline_getrange_fix' of https://github.com/UglyTroLL/jedis into UglyTroLL-pipeline_getrange_fix 2014-08-12 10:16:31 +09:00
Jungtaek Lim
e6d08f46fb Merge branch 'remove-pexpire-int' of https://github.com/aniketschneider/jedis into aniketschneider-remove-pexpire-int 
Conflicts:
	src/main/java/redis/clients/jedis/Client.java
 2014-08-12 10:12:44 +09:00
Jungtaek Lim
5bf4a697fb Merge branch 'unsigned_long_cursor_remove_deprecated' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_remove_deprecated 
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
 2014-08-12 10:07:26 +09:00
Jungtaek Lim
26d1f4ad90 Merge branch 'support-cluster-slots' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-support-cluster-slots 2014-08-12 09:48:53 +09:00
Jungtaek Lim
1e94acd7da Merge branch 'fix/complete-interface' of https://github.com/lstrojny/jedis into lstrojny-fix/complete-interface 2014-08-12 09:40:45 +09:00
Jungtaek Lim
514144d472 Fix indentation (code formatting...) 2014-08-08 10:56:39 +09:00
Jungtaek Lim
1877185153 Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status 
* it's broken with later features, resetState()
* fixed resetState() to make it work with this PR

Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Pipeline.java
	src/main/java/redis/clients/jedis/Transaction.java
	src/main/java/redis/clients/jedis/TransactionBlock.java
 2014-08-08 10:46:43 +09:00
Jonathan Leibiusky
2d93fa0e2b version bump 2014-08-04 11:20:52 -04:00
Jungtaek Lim
03c0af2581 Merge pull request #685 from HeartSaVioR/master 
Fixed critical JedisCluster bug : hlen calls hdel
 2014-08-04 09:40:20 +09:00
Jungtaek Lim
d7cd3a0af6 Fixed critical JedisCluster bug : hlen calls hdel 2014-08-04 09:28:17 +09:00
Jungtaek Lim
4f693872b9 Merge pull request #677 from macgngsta/master 
Fixed Gradle build file
 2014-07-18 12:53:01 +09:00
Greg Tam
c2624c6c93 fixed the name of archiveBaseName to archivesBaseName 2014-07-17 15:11:02 -06:00
Jungtaek Lim
e67a80f694 Merge pull request #675 from evenX86/patch-1 
fix comment which describe LPOP from rpop method
 2014-07-17 19:10:13 +09:00
xuyifei
088d86a60f Update Jedis.java 
edit the rpop note (just makei it Specific
 2014-07-17 16:40:22 +08:00
Jungtaek Lim
76df52ef9d Merge pull request #668 from HeartSaVioR/fix-build-related-to-change-of-cluster-nodes-output 
fix build after CLUSTER NODES output has been changed
 2014-07-02 08:01:51 +09:00
Jungtaek Lim
0f472c97a2 fix build after CLUSTER NODES output has been changed 
* https://github.com/antirez/redis/issues/1848
* we don't need to handle :0 by changes
 2014-07-02 07:42:29 +09:00
Jungtaek Lim
fd23f8b8f7 Support CLUSTER SLOTS command 
* CLUSTER SLOTS returns a Redis-formatted mapping from slot ranges to IP/Port pairs serving that slot range
* description link including output format
** e14829de30
* Unit test included
 2014-07-02 06:46:58 +09:00
Lars Strojny
18c4a987d5 Completing interface 2014-07-01 15:41:57 +02:00
Jonathan Leibiusky
e05eaa2b07 [maven-release-plugin] prepare for next development iteration 2014-05-29 11:44:57 -04:00
Jonathan Leibiusky
fdce5fb692 [maven-release-plugin] prepare release jedis-2.5.1 2014-05-29 11:44:56 -04:00
Jonathan Leibiusky
d02e56c4f8 Merge pull request #651 from xetorthio/protocol_bound_fix 
Checks for buffer out of bounds before writing to the stream. Fixes #636
 2014-05-29 11:43:16 -04:00
Jungtaek Lim
74b527d629 Merge pull request #648 from dustinlineweber/patch-1 
stupid-small update to README.md
 2014-05-28 05:48:10 +09:00
Dustin Lineweber
58ebeed00e Update README.md 2014-05-27 15:37:42 -05:00
Jonathan Leibiusky
7e8b09e610 [maven-release-plugin] prepare for next development iteration 2014-05-27 12:50:25 -04:00
Jonathan Leibiusky
9aab05f9d0 [maven-release-plugin] prepare release jedis-2.5.0 2014-05-27 12:50:23 -04:00
Jungtaek Lim
6f8d46ae4f Merge branch 'master' into implements-closeable-to-pooled-jedis-shardedjedis 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisSentinelPool.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
 2014-05-26 11:18:45 +09:00
Marcos Nils
0a8aa7ae1d Merge pull request #606 from HeartSaVioR/append-package-command-in-makefile 
Append 'package' command in Makefile
 2014-05-25 23:05:39 +03:00
Marcos Nils
667eeaf815 Merge pull request #626 from HeartSaVioR/fix-pipeline-throws-npe-without-multi 
Fix Pipeline throws NPE using exec without multi (fixes #623)
 2014-05-25 22:52:41 +03:00
Marcos Nils
1fba7de9bc Change back commons pool to 2.0 as 2.2 isn't fully tested 2014-05-25 16:51:47 -03:00
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