967 Commits

Author SHA1 Message Date
3817f4c7ed Replace tabs with spaces 2015-09-01 13:13:24 +01:00
cdd16a53af Move to new license, keep old for reference 2015-06-11 23:00:23 +01:00
81ba28a7b6 Update build.gradle to build artifact com.github.boukefalos:jlibredis:2.6.2 with gradle wrapper 2.2 2014-11-30 11:51:44 +00:00
Jungtaek Lim
bd2f12c04e bump up version 2014-11-25 21:36:59 +09:00
Tobias Ara Svensson
3257827f01 Fixes #791 Exceptions in close cause empty JedisPool and then deadlock 2014-11-24 12:23:42 +01:00
Marcos Nils
0c9c4c8b79 Merge pull request #774 from asikkema/cluster_incryByFloat
Adds incrByFloat as cluster command
2014-11-16 18:40:42 -03:00
rdifalco
59a13121ab Addresses issues #779 and #775.
Conflicts:
	src/main/java/redis/clients/jedis/Protocol.java
2014-11-14 09:49:46 +09:00
Jungtaek Lim
5d0f75a32f Merge branch 'master' of github.com:rdifalco/jedis into rdifalco-master
Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
2014-11-13 13:20:59 +09:00
Marcos Lilljedahl
f9fb8843df Fixes #786 2014-11-12 11:17:43 -03:00
Jungtaek Lim
47da7a12ea Merge branch 'HeartSaVioR-jedis-pubsub-adaptor' 2014-11-11 08:00:39 +09:00
Jungtaek Lim
57d2e2ea05 Merge branch 'jedis-pubsub-adaptor' of github.com:HeartSaVioR/jedis into HeartSaVioR-jedis-pubsub-adaptor 2014-11-11 08:00:32 +09:00
Jungtaek Lim
a170b9f0d2 Merge branch 'master' of github.com:xetorthio/jedis 2014-11-11 07:56:51 +09:00
Jungtaek Lim
7eb78548ec Merge branch 'HeartSaVioR-fixes-758' 2014-11-11 07:31:53 +09:00
Jungtaek Lim
1873d55c2c Merge branch 'fixes-758' of github.com:HeartSaVioR/jedis into HeartSaVioR-fixes-758 2014-11-11 07:31:38 +09:00
Marcos Nils
c769a81bc9 Merge pull request #785 from xetorthio/jdk8
Fix tests in JDK8
2014-11-10 14:04:09 -03:00
Jungtaek Lim
8a33ab6e9a Remove Adaptor and update their own class (PubSub) 2014-11-07 23:11:43 +09:00
Marcos Lilljedahl
4cb77ea6b8 Remove opendk as it's not present 2014-11-06 22:52:29 -03:00
Marcos Lilljedahl
d67b3cfcf2 Add again other jdks 2014-11-06 22:48:51 -03:00
Marcos Lilljedahl
161e509178 Fix disconnect socket closing to make it work with java 8 2014-11-06 22:45:04 -03:00
Marcos Lilljedahl
fe261c7784 Remove unnecessary jdks for testing purposes 2014-11-06 21:42:04 -03:00
Marcos Lilljedahl
af309be82f Add different jdk 2014-11-06 21:41:00 -03:00
Marcos Lilljedahl
a71501251d Change travis to run tests again jdk8 only 2014-11-06 21:37:12 -03:00
Jungtaek Lim
4ecca016a5 Introduce (Binary)JedisPubSubAdaptor
* Actually it's in JedisSentinelPool but not exposed to users
2014-11-04 22:42:17 +09:00
Jungtaek Lim
f7995a7771 Merge branch 'remove_deprecated_transactionblock_and_pipelineblock' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-remove_deprecated_transactionblock_and_pipelineblock
Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/PipelineBlock.java
	src/main/java/redis/clients/jedis/TransactionBlock.java
2014-10-23 09:36:07 +09:00
Jungtaek Lim
3495402b44 Merge branch 'master' of https://github.com/yangzhe1991/jedis into yangzhe1991-master 2014-10-21 20:14:31 +09:00
Philo Yang
6afabaca1d fix redirection's bug 2014-10-21 14:30:27 +08:00
Albert Sikkema
d6850457bf Adds incrByFloat as cluster command 2014-10-20 11:17:23 +02:00
rdifalco
076df8c92d Expanded deprecated comment, fixed a misspelling of DECRBY. 2014-10-19 13:22:17 -07:00
Jungtaek Lim
0601d453ff Jedis unit tests works with 'latest' unstable branch 2014-10-20 00:02:44 +09:00
Jungtaek Lim
49a4d5a450 Unify 'how to contribute' to CONTRIBUTING.md 2014-10-19 18:10:33 +09:00
Jungtaek Lim
252a7822f4 Fix typo, more description to CONTRIBUTING.md 2014-10-19 17:22:15 +09:00
Jungtaek Lim
6a2a2109c8 Create CONTRIBUTING.md to help newbie contributors 2014-10-19 17:14:55 +09:00
rdifalco
8f4dbaf89f Fixed infinite timeout handling. Increased code reuse so that there will be fewer copy and paste errors. 2014-10-18 12:22:07 -07:00
Jungtaek Lim
7f45a2ca24 Apply "Format" to all files, Closes #765 2014-10-09 21:08:05 +09:00
Jungtaek Lim
4db138921e Unify style 2014-10-09 09:06:43 +09:00
Jungtaek Lim
5575f08076 only Connection should take care of default host, port 2014-10-09 08:51:42 +09:00
Jungtaek Lim
b2fcbed66f Merge branch 'making_jedis_pool_cdi_compatible' of https://github.com/nykolaslima/jedis into nykolaslima-making_jedis_pool_cdi_compatible 2014-10-09 08:35:06 +09:00
Nykolas Lima
f7789213df using super instead of this to keep the code style 2014-10-08 17:37:29 -03:00
Jungtaek Lim
a8891cb00c Add unit tests to check pipeline sync without any commands 2014-10-05 14:36:14 +09:00
Jungtaek Lim
70809ee142 Merge branch 'master' of https://github.com/nilskp/jedis into fixes-758 2014-10-05 14:24:37 +09:00
Jungtaek Lim
7845dc350a Merge branch 'fast-fail-while-initializing-jedis-sentinel-pool' 2014-10-05 11:01:09 +09:00
Jungtaek Lim
9c296000a2 Remove unnecessary if state 2014-10-05 10:52:05 +09:00
Jungtaek Lim
6d5cb5c07b Merge branch 'nykolaslima-improving_javadoc' 2014-10-05 10:18:57 +09:00
Jungtaek Lim
35a1174fb1 Merge branch 'improving_javadoc' of https://github.com/nykolaslima/jedis into nykolaslima-improving_javadoc 2014-10-05 10:18:44 +09:00
nilskp
745f1b1e4e Updated fix to xetorthio/jedis#758 2014-10-04 11:22:45 -05:00
nilskp
6ea1959cc5 Fixes xetorthio/jedis#758 2014-10-03 15:36:09 -05:00
Nykolas Lima
d7105914aa adding information about redis versions 2014-10-03 14:23:00 -03:00
Nykolas Lima
a3422bd898 ttl return -1 if key does not have an associated expire but return -2 if key does not exists 2014-10-03 13:57:34 -03:00
Jungtaek Lim
321e5136be Merge branch 'master' of github.com:xetorthio/jedis 2014-10-03 23:51:03 +09:00
Jungtaek Lim
e9cd3b36c1 Modify YourKit logo to black font 2014-10-03 23:49:51 +09:00