Merge branch 'master' into introduce-new-sentinel-commands-added-to-Redis-2.8
Conflicts: Makefile src/main/java/redis/clients/jedis/Jedis.java
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -9,7 +9,7 @@
|
||||
<packaging>jar</packaging>
|
||||
<groupId>redis.clients</groupId>
|
||||
<artifactId>jedis</artifactId>
|
||||
<version>2.2.2-SNAPSHOT</version>
|
||||
<version>2.3.1-SNAPSHOT</version>
|
||||
<name>Jedis</name>
|
||||
<description>Jedis is a blazingly small and sane Redis java client.</description>
|
||||
<url>https://github.com/xetorthio/jedis</url>
|
||||
|
||||
Reference in New Issue
Block a user