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

678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Leibiusky
ce3e76f246 Merge pull request #540 from xetorthio/closeable-support 
Closeable support
 2014-02-11 12:35:34 -05:00
Jonathan Leibiusky
fcef705a6c Add unit tests to Closeable 2014-02-11 12:31:32 -05:00
Jonathan Leibiusky
79f1dcb92b Merge branch 'master' of github.com:hgschmie/jedis into hgschmie-master 2014-02-11 12:22:01 -05:00
Jonathan Leibiusky
ba767cc5d4 Merge branch 'introduce-new-sentinel-commands-added-to-Redis-2.8' of github.com:HeartSaVioR/jedis into HeartSaVioR-introduce-new-sentinel-commands-added-to-Redis-2.8 2014-02-11 12:11:57 -05:00
Jonathan Leibiusky
bd364c6f70 Merge branch 'master' into HeartSaVioR-unsigned_long_cursor_with_compatibility 2014-02-11 12:05:26 -05:00
Jonathan Leibiusky
e271acb79c Fix redis leak when testing 2014-02-11 12:04:47 -05:00
Jonathan Leibiusky
3bca5d8460 Merge branch 'unsigned_long_cursor_with_compatibility' of github.com:HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_with_compatibility 2014-02-11 11:29:18 -05:00
Jonathan Leibiusky
9776bbb4f8 Merge pull request #537 from HeartSaVioR/deprecated_transactionblock_and_pipelineblock 
Mark @Duplicated to TransactionBlock and PipelineBlock related classes / methods
 2014-02-11 11:28:09 -05:00
Jonathan Leibiusky
d8ec0f8a5c version bump 2014-02-11 11:21:18 -05:00
Jonathan Leibiusky
08ed0006e8 Merge pull request #539 from xetorthio/cluster_bugfix 
Fix test to make jedis work with latest git master version of redis
 2014-02-11 10:25:55 -05:00
Marcos Nils
e59e4a0d2a Fix test to make jedis work with latest git master version of redis 2014-02-11 02:51:58 -03:00
Jonathan Leibiusky
dbae544602 Merge pull request #528 from jideji/eval-with-nested-lists-and-longs 
Eval with nested lists and longs
 2014-02-10 15:36:05 -05:00
Jungtaek Lim
1ed231cf15 Mark @Duplicated to TransactionBlock and PipelineBlock related classes / 
methods
 2014-02-10 07:55:27 +09:00
Jungtaek Lim
ed81f37d1b Introduce *scan with "string" cursor parameter to support unsigned long 
cursor

* overload all *scan method to change "int" cursor to "string" cursor
* set @Deprecated and leave reason to deprecate and when to remove to
current *scan method
* modify unit tests to make it work with new *scan method
 2014-02-10 07:08:39 +09:00
Daniel Josefsson
f81f75177c Simplified unit test for compatibility with JDK6. 2014-02-08 10:10:45 +00:00
Henning Schmiedehausen
7449619fca Implement Closeable for Jedis, BinaryJedis etc. 
This allows a Jedis object to participate in try-with-resources when
using Java 7+. This change is fully backwards compatible to Java 6 and
previous releases of the Jedis client.
 2014-02-07 13:39:41 -08:00
Daniel Josefsson
40c8a93340 Merge branch 'master' into eval-with-nested-lists-and-longs 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/test/java/redis/clients/jedis/tests/commands/ScriptingCommandsTest.java
 2014-02-05 22:24:23 +00:00
Jonathan Leibiusky
51a4bf9a56 [maven-release-plugin] prepare for next development iteration 2014-02-05 10:51:37 -05:00
Jonathan Leibiusky
f7f689efaf [maven-release-plugin] prepare release jedis-2.3.1 2014-02-05 10:51:36 -05:00
Jonathan Leibiusky
75bc754227 Update README to indicate that redis 2.8.5 is supported 2014-02-05 10:48:40 -05:00
Jonathan Leibiusky
28e7d2af10 Revert "Update README on supported redis version" 
This reverts commit b35e1f9482.
 2014-02-05 10:47:11 -05:00
Jonathan Leibiusky
179498d4a3 Merge pull request #527 from xetorthio/node_parsing 
Fix #526. Node parsing error uppon :0
 2014-02-05 10:38:21 -05:00
Jonathan Leibiusky
b35e1f9482 Update README on supported redis version 2014-02-05 10:34:17 -05:00
Marcos Nils
a69dd4e242 Add exception handling in caso of unexecpected errors 2014-02-05 00:06:29 -03:00
Marcos Nils
d846149ae1 Fix #526. Node parsing error uppon :0 2014-02-04 22:34:48 -03:00
Jungtaek Lim
a5363582a6 Apply "Java Convention" to met Jedis's preferred source code Convention 2014-02-05 07:52:53 +09:00
Jungtaek Lim
dd62e360fa Apply "Java Convention" to met Jedis's preferred source code Convention 2014-02-05 00:45:48 +09:00
Jungtaek Lim
13f0c32f7c Add unit test for "sentinel set quorum" introduced by Redis 2.8.5 2014-02-05 00:41:34 +09:00
Jungtaek Lim
6efeb45952 Merge branch 'master' into introduce-new-sentinel-commands-added-to-Redis-2.8 
Conflicts:
	Makefile
	src/main/java/redis/clients/jedis/Jedis.java
 2014-02-05 00:26:14 +09:00
Jonathan Leibiusky
2d04a3845b [maven-release-plugin] prepare for next development iteration 2014-02-03 11:09:50 -05:00
Jonathan Leibiusky
aa63c98d8e [maven-release-plugin] prepare release jedis-2.3.0 2014-02-03 11:09:48 -05:00
Marcos Nils
35291bf17d Make makefile remove temp files as it makes tests to fail sometimes 2014-02-03 13:01:20 -03:00
Jonathan Leibiusky
56cec8f6ec version bump to 2.3.0-snapshot 2014-02-03 10:50:59 -05:00
Jonathan Leibiusky
bfecfcb744 Merge pull request #523 from xetorthio/pubsub 
Add pubsub commands
 2014-02-03 07:47:49 -08:00
Jonathan Leibiusky
d5f984a9d6 Merge branch 'transaction-block-should-not-call-discard-when-exception-ocurred' of github.com:HeartSaVioR/jedis into HeartSaVioR-transaction-block-should-not-call-discard-when-exception-ocurred 
Conflicts:
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
 2014-02-03 10:46:23 -05:00
Marcos Nils
4ab54d955d Change pubSub to pubsub 2014-02-03 12:44:40 -03:00
Marcos Nils
4b53160a74 Remove unnecessary Builder and fix merge issue. Fixes #520 2014-02-01 20:52:41 -03:00
Marcos Nils
bd19193cb6 Merged with master 2014-02-01 20:41:14 -03:00
Marcos Nils
319a241de0 Remove unnecessary imports 2014-02-01 20:15:52 -03:00
Marcos Nils
8bec9fd373 Implement missing pubsub commands and fix indentation 2014-02-01 20:14:18 -03:00
Jonathan Leibiusky
8fef62e21d Merge branch 'pubsub-concurrency' of github.com:ibuildthecloud/jedis into ibuildthecloud-pubsub-concurrency 
Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/JedisPubSub.java
 2014-01-31 13:28:29 -05:00
Jonathan Leibiusky
d7c5823cbb Merge pull request #524 from xetorthio/reformat-all 
Reformat all files in the project according to java conventions.
 2014-01-31 08:25:16 -08:00
Jonathan Leibiusky
105ca9f5bb Reformat all files in the project according to java conventions. 2014-01-31 11:24:06 -05:00
Jonathan Leibiusky
3e99749b2e Merge branch 'missedbuffer' of github.com:ibuildthecloud/jedis into ibuildthecloud-missedbuffer 2014-01-28 16:53:53 -05:00
Jonathan Leibiusky
265eab0cc9 Merge branch 'reset-state-of-jedis-client' of github.com:HeartSaVioR/jedis into HeartSaVioR-reset-state-of-jedis-client 2014-01-28 16:50:11 -05:00
Marcos Nils
1844e29569 Fix typo in cluster snippet from README 2014-01-28 11:04:21 -03:00
Jonathan Leibiusky
dca7ab1bbd Merge pull request #516 from HeartSaVioR/fix-timing-issues-with-monitor-test 
Fix ControlCommandsTest to don't hang from monitor test because of timing issue
 2014-01-27 07:11:08 -08:00
Jungtaek Lim
642cec66d5 Fix ControlCommandsTest to don't hang from monitor test because of timing issue 
* In monitor command test, input thread waits for monitor thread to monitor
** Monitor command test sometimes hang when input thread run earlier than monitor thread.
 2014-01-27 12:47:21 +09:00
Jonathan Leibiusky
adcb0c0265 Merge pull request #515 from xetorthio/zadd_scoremembers 
Change zadd parameter order to allow duplicated scoremembers but not members
 2014-01-26 09:19:16 -08:00
Marcos Nils
b05d9adfb0 Change zadd parameter order to allow duplicated scoremembers but not members 2014-01-26 13:53:34 -03:00