Commit Graph

557 Commits

Author SHA1 Message Date
Jonathan Leibiusky
5244d82450 Merge branch 'Object' of git://github.com/ivowiblo/jedis
Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedisCommands.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
2012-04-23 23:00:13 -03:00
Jonathan Leibiusky
05503212aa Merge branch 'variadic' of git://github.com/ivowiblo/jedis into variadic
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
2012-04-23 21:00:29 -03:00
Jonathan Leibiusky
3da2f2dd57 Merge branch 'slowlog' of git://github.com/ivowiblo/jedis into slowlog
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java
2012-04-23 20:35:55 -03:00
Eric Hauser
618bbec738 Merge pull request #247 from AlanKrueger/jedis
---

Referenced the Eclipse plugin in the build.gradle and added the bin directory Eclipse creates to the .gitignore file.
2012-04-19 16:54:48 -04:00
Eric Hauser
094023a7ce make gradlew executable 2012-04-19 16:53:06 -04:00
Eric Hauser
f1a4b7a2bf Merge pull request #246 from AlanKrueger/jedis
---

Added the wrapper task to build.gradle referencing 1.0-milestone-6 and ran it.
2012-04-19 16:50:51 -04:00
Eric Hauser
5a6d98ac56 fix broken instance reference to protocol 2012-04-19 16:48:18 -04:00
Eric Hauser
94e3d25ab8 Merge pull request #211 from raszi/9d4d11ef466d7a890e763bb1b98b044e3d8635b4
My previous static Protocol fix
2012-04-19 11:51:29 -07:00
Eric Hauser
7b6ede8cd6 Merge pull request #285 from tom-martin/patch-1
Fix NPE in BuilderFactory for Double.
2012-04-19 11:49:43 -07:00
Tom Martin
dbd7c8b53f Fix NPE in BuilderFactory for Double. 2012-04-19 13:38:40 +02:00
ivowiblo
c765bc3910 Style refactor 2012-04-19 03:04:06 -04:00
ivowiblo
e008f403b1 SLOWLOG RESET is fixed 2012-04-19 02:59:52 -04:00
ivowiblo
d5c2b9965c Slowlog commands. The unit test is failing. 2012-04-19 02:53:26 -04:00
ivowiblo
dd88c51db8 Tests for Variadic commands 2012-04-19 01:51:02 -04:00
ivowiblo
d102ccf1b9 Object commands are supported 2012-04-19 00:32:23 -04:00
Jonathan Leibiusky
f3dbc65bd1 Merge branch 'scriptsupport' of git://github.com/ivowiblo/jedis into ivowiblo-scriptsupport 2012-04-18 18:10:45 -03:00
ivowiblo
8aca0b77f9 Variadic commands 2012-04-18 15:22:43 -04:00
ivowiblo
e4f7f61d00 Pipeline.sort with dstkey uses right Response type 2012-04-18 00:33:20 -04:00
ivowiblo
ded776f859 Pool.java back to the original 2012-04-18 00:27:00 -04:00
Ivo Ramirez
e8c27e0d15 Jedis does support lpushx and rpushx
Conflicts:

	src/main/java/redis/clients/jedis/BinaryJedisCommands.java
	src/main/java/redis/clients/jedis/Pipeline.java
2012-04-18 00:23:38 -04:00
ivowiblo
088f84b6b2 Extra space is removed 2012-04-17 21:37:33 -04:00
Ivo Ramirez
75e52b9a26 z*range commands now receive long instead of int. #242 2012-04-17 21:34:56 -04:00
ivowiblo
0f978f5236 Unused import is removed 2012-04-17 21:13:37 -04:00
Jonathan Leibiusky
d136225281 remove unused import 2012-04-17 18:45:31 -03:00
Jonathan Leibiusky
caac6480ac Merge branch 'variadic_arg_support' of git://github.com/shaofengniu/jedis into shaofengniu-variadic_arg_support 2012-04-17 18:40:17 -03:00
Jonathan Leibiusky
aa05406e4a Merge branch 'patch-1' of git://github.com/thesmith/jedis into thesmith-patch-1 2012-04-17 18:35:36 -03:00
Jonathan Leibiusky
b2648381e2 Merge branch 'Issue171' of git://github.com/ivowiblo/jedis into ivowiblo-issue171 2012-04-17 18:30:30 -03:00
Jonathan Leibiusky
d18c77d56f Merge branch 'select_pipeline' of git://github.com/ivowiblo/jedis into ivowiblo-select_pipeline 2012-04-17 18:24:59 -03:00
Jonathan Leibiusky
f632182657 update how to run tests 2012-04-17 18:09:16 -03:00
Ivo Ramirez
53f829fb10 JedisPool accepts BinaryJedis as a resource for return. Issue #171
Conflicts:

	src/main/java/redis/clients/util/Pool.java
2012-04-17 16:56:26 -04:00
ivowiblo
c9b413c323 Select support to pipeline. Thanks to @ib84 2012-04-17 16:40:54 -04:00
ivowiblo
9e13233bbf DS_Store files removed 2012-04-17 16:06:03 -04:00
ivowiblo
df75c72825 Eval and Evalsha api improved 2012-04-14 22:54:43 -03:00
Jonathan Leibiusky
ef08981ba3 add makefile to run tests easier 2012-04-14 10:44:40 -03:00
Ivo Ramirez
df1dfce327 SCRIPT KILL command fixed 2012-04-14 10:26:14 -03:00
Ivo Ramirez
9bf19c6237 Binary scripting API is tested 2012-04-14 10:17:41 -03:00
ivowiblo
96d405a6e3 scripting support 2012-04-14 09:10:00 -03:00
Ivo Ramirez
3c86ebcd36 Script commands are supported. 2012-04-14 08:45:26 -03:00
Ivo Ramirez
9dc89626ac Eval and Evalsha is now supported
Conflicts:

	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Jedis.java
2012-04-14 08:41:27 -03:00
ivowiblo
be163acd52 Merge remote-tracking branch 'upstream/master' 2012-04-14 01:10:26 -03:00
Ben Smith
df3c57940a Fixing Sharded Pipeline as the zrange should be built with a STRING_ZSET 2012-03-23 17:02:16 +00:00
Shaofeng Niu
f010bc0f32 add variadic arguments support to lpush and rpush 2012-02-14 17:42:06 +08:00
Alan Krueger
4d6f4c7a94 add Eclipse support 2011-12-23 16:41:29 -06:00
Alan Krueger
12a1a70d39 update Gradle support 2011-12-23 16:41:29 -06:00
Jonathan Leibiusky
72ca494362 add missing command to Transaction, BinaryTransaction and Pipeline 2011-12-23 12:31:32 -03:00
Jonathan Leibiusky
6f4a32d2a1 add select to transaction 2011-12-23 11:44:39 -03:00
ivos
f3a5d62e2b Issue #158 is fixed: Response.get() returns null if redis returned null (i.e. when using zscore for a non existing member) 2011-12-14 09:18:36 -03:00
ivos
fb723db86d Issue #158 is fixed: Response.get() returns null if redis returned null (i.e. when using zscore for a non existing member) 2011-12-14 05:43:52 +01:00
Hamza Kaya
b17692ad9a Pipeline uses wrong response builder for get and getSet 2011-12-13 21:32:09 -03:00
Jonathan Leibiusky
79965d5d0a Merge remote branch 'raszi/findbugs'
Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
2011-12-13 19:16:14 -03:00