Attempted fix for #1229 - multiple entries in node list for same host

.github/CONTRIBUTING.md

@@ -0,0 +1,56 @@
+# How to use Jedis Github Issue
+
+* Github issues SHOULD ONLY BE USED to report bugs, and for DETAILED feature requests. Everything else belongs to the Jedis Google Group.
+
+Jedis Google Group address:
+
+https://groups.google.com/forum/?fromgroups#!forum/jedis_redis
+
+Please post General questions to Google Group. It can be closed without answer when posted to Github issue.
+
+# Some rules of Jedis source code
+
+## Code Convention
+
+* Jedis uses ```HBase Formatter``` introduced by [HBASE-5961](https://issues.apache.org/jira/browse/HBASE-5961)
+* You can import code style file (located to hbase-formatter.xml) to Eclipse, IntelliJ
+  * line break by column count seems not working with IntelliJ
+* You can run ```make format``` anytime to reformat without IDEs
+
+## Adding commands
+
+* Jedis uses many interfaces to structure commands
+  * planned to write documentation about it, contribution is more welcome!
+* We need to add commands to all interfaces which have responsibility to expose
+  * ex) We need to add ping() command to BasicCommands, and provide implementation to all of classes which implemented BasicCommands
+
+## type <-> byte array conversion
+
+* string <-> byte array : use SafeEncoder.encode()
+  * Caution: use String.toBytes() directly will break GBK support!
+* boolean, int, long, double -> byte array : use Protocol.toByteArray()
+
+# How to contribute by Pull Request
+
+1. Fork Jedis on github (http://help.github.com/fork-a-repo/)
+2. Create a topic branch (git checkout -b my_branch)
+3. Push to your branch (git push origin my_branch)
+4. Post a pull request on github (http://help.github.com/send-pull-requests/)
+
+I recommend you to create branch with meaningful name, not modifying master branch directly.
+
+Please add unit tests in order to prove your modification works smoothly. And please make sure your modification passes all unit tests.
+
+# Jedis Test Environment
+
+Jedis unit tests run with latest [```Redis unstable branch```](https://github.com/antirez/redis).
+Please let them prepared and installed.
+
+Jedis unit tests use many Redis instances, so we use ```Makefile``` to prepare environment. 
+
+You can start test with ```make test```.
+You can set up test environments by ```make start```, and tear down environments by ```make stop```.
+
+If one or some of unit tests in current master branch of Jedis fails with Redis unstable branch, please post it to Github issue, and go ahead with other unit tests at your work.
+
+Thanks!

.github/ISSUE_TEMPLATE

@@ -0,0 +1,27 @@
+### Expected behavior
+
+Write here what you're expecting ...
+
+### Actual behavior
+
+Write here what happens instead ...
+
+### Steps to reproduce:
+
+Please create a reproducible case of your problem. Make sure
+that case repeats consistently and it's not random
+1.
+2.
+3.
+
+### Redis / Jedis Configuration
+
+#### Jedis version:
+
+#### Redis version:
+
+#### Java version:
+
+
+
+

.travis.yml

@@ -1,7 +1,16 @@
+sudo: required
 language: java
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
-install: make travis-install
+  - oraclejdk8
+before_install:
+    - wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.29.tar.gz
+    - tar -xvzf stunnel.tar.gz
+    - cd ./stunnel-5.29 && ./configure && make && sudo make install && cd ..
+install:
+  - make travis-install
 script: make test
+cache:
+  directories:
+    - $HOME/.m2

Makefile

@@ -1,4 +1,5 @@
 PATH := ./redis-git/src:${PATH}
+STUNNEL_BIN := $(shell which stunnel)
 
 define REDIS1_CONF
 daemonize yes
@@ -116,6 +117,18 @@ pidfile /tmp/sentinel3.pid
 logfile /tmp/sentinel3.log
 endef
 
+define REDIS_SENTINEL4
+port 26382
+daemonize yes
+sentinel monitor mymaster 127.0.0.1 6381 1
+sentinel auth-pass mymaster foobared
+sentinel down-after-milliseconds mymaster 2000
+sentinel parallel-syncs mymaster 1
+sentinel failover-timeout mymaster 120000
+pidfile /tmp/sentinel4.pid
+logfile /tmp/sentinel4.log
+endef
+
 # CLUSTER REDIS NODES
 define REDIS_CLUSTER_NODE1_CONF
 daemonize yes
@@ -189,6 +202,15 @@ cluster-enabled yes
 cluster-config-file /tmp/redis_cluster_node6.conf
 endef
 
+#STUNNEL
+define STUNNEL_CONF
+cert = src/test/resources/private.pem
+pid = /tmp/stunnel.pid
+[redis]
+accept = 127.0.0.1:6390
+connect = 127.0.0.1:6379
+endef
+
 export REDIS1_CONF
 export REDIS2_CONF
 export REDIS3_CONF
@@ -199,14 +221,23 @@ export REDIS7_CONF
 export REDIS_SENTINEL1
 export REDIS_SENTINEL2
 export REDIS_SENTINEL3
+export REDIS_SENTINEL4
 export REDIS_CLUSTER_NODE1_CONF
 export REDIS_CLUSTER_NODE2_CONF
 export REDIS_CLUSTER_NODE3_CONF
 export REDIS_CLUSTER_NODE4_CONF
 export REDIS_CLUSTER_NODE5_CONF
 export REDIS_CLUSTER_NODE6_CONF
+export STUNNEL_CONF
+export STUNNEL_BIN
+
 
-start: cleanup
+ifndef STUNNEL_BIN
+    SKIP_SSL := !SSL*,
+endif
+export SKIP_SSL
+
+start: stunnel cleanup
 	echo "$$REDIS1_CONF" | redis-server -
 	echo "$$REDIS2_CONF" | redis-server -
 	echo "$$REDIS3_CONF" | redis-server -
@@ -219,6 +250,8 @@ start: cleanup
 	echo "$$REDIS_SENTINEL2" > /tmp/sentinel2.conf && redis-server /tmp/sentinel2.conf --sentinel
 	@sleep 0.5
 	echo "$$REDIS_SENTINEL3" > /tmp/sentinel3.conf && redis-server /tmp/sentinel3.conf --sentinel
+	@sleep 0.5
+	echo "$$REDIS_SENTINEL4" > /tmp/sentinel4.conf && redis-server /tmp/sentinel4.conf --sentinel
 	echo "$$REDIS_CLUSTER_NODE1_CONF" | redis-server -
 	echo "$$REDIS_CLUSTER_NODE2_CONF" | redis-server -
 	echo "$$REDIS_CLUSTER_NODE3_CONF" | redis-server -
@@ -230,6 +263,10 @@ cleanup:
 	- rm -vf /tmp/redis_cluster_node*.conf 2>/dev/null
 	- rm dump.rdb appendonly.aof - 2>/dev/null
 
+stunnel:
+	@if [ -e "$$STUNNEL_BIN" ]; then\
+	    echo "$$STUNNEL_CONF" | stunnel -fd 0;\
+	fi
 stop:
 	kill `cat /tmp/redis1.pid`
 	kill `cat /tmp/redis2.pid`
@@ -241,12 +278,14 @@ stop:
 	kill `cat /tmp/sentinel1.pid`
 	kill `cat /tmp/sentinel2.pid`
 	kill `cat /tmp/sentinel3.pid`
+	kill `cat /tmp/sentinel4.pid`
 	kill `cat /tmp/redis_cluster_node1.pid` || true
 	kill `cat /tmp/redis_cluster_node2.pid` || true
 	kill `cat /tmp/redis_cluster_node3.pid` || true
 	kill `cat /tmp/redis_cluster_node4.pid` || true
 	kill `cat /tmp/redis_cluster_node5.pid` || true
 	kill `cat /tmp/redis_cluster_node6.pid` || true
+	kill `cat /tmp/stunnel.pid` || true
 	rm -f /tmp/sentinel1.conf
 	rm -f /tmp/sentinel2.conf
 	rm -f /tmp/sentinel3.conf
@@ -260,7 +299,7 @@ stop:
 test:
 	make start
 	sleep 2
-	mvn -Dtest=${TEST} clean compile test
+	mvn -Dtest=${SKIP_SSL}${TEST} clean compile test
 	make stop
 
 package:
@@ -273,11 +312,14 @@ deploy:
 	mvn clean deploy
 	make stop
 
+format:
+	mvn java-formatter:format
+
 release:
 	make start
 	mvn release:clean
 	mvn release:prepare
-	mvn release:perform
+	mvn release:perform -DskipTests
 	make stop
 
 travis-install:

README.md

@@ -6,7 +6,7 @@ Jedis is a blazingly small and sane [Redis](http://github.com/antirez/redis "Red
 
 Jedis was conceived to be EASY to use.
 
-Jedis is fully compatible with redis 2.8.5.
+Jedis is fully compatible with redis 2.8.x and 3.0.x.
 
 ## Community
 
@@ -48,7 +48,7 @@ Or use it as a maven dependency:
 <dependency>
     <groupId>redis.clients</groupId>
     <artifactId>jedis</artifactId>
-    <version>2.4.2</version>
+    <version>2.8.0</version>
     <type>jar</type>
     <scope>compile</scope>
 </dependency>
@@ -81,23 +81,32 @@ jc.set("foo", "bar");
 String value = jc.get("foo");
 ```
 
-## I want to contribute!
+## FAQ
+
+- Do you have strange stack traces?
+- You're getting errors when running jedis in multi-threaded environments?
+- Do you need further instructions about pipelining, transactions or sentinel?
 
-That is great! Just fork the project in github. Create a topic branch, write some code, and add some tests for your new code.
+Please check the [WIKI](https://github.com/xetorthio/jedis/wiki) for more useful information.
 
-To run the tests:
 
-- Use the latest redis master branch.
+## I want to contribute!
+
+That is great!
 
-- Run ```make test```. This will run 2 instances of redis. We use 2 redis
-	servers, one on default port (6379) and the other one on (6380). Both have
-	authentication enabled with default password (foobared). This way we can
-	test both sharding and auth command. For the Sentinel tests to we use a
-	default Sentinel configuration that is configured to properly authenticate
-	using the same password with a master called mymaster running on 6379.
+Please see CONTRIBUTING.md on project's root directory for follow up how to contribute to Jedis project.
 
 Thanks for helping!
 
+## Sponsorship
+
+YourKit supports open source projects with its full-featured Java Profiler.
+YourKit, LLC is the creator of [YourKit Java Profiler](http://www.yourkit.com/java/profiler/index.jsp) 
+and [YourKit .NET Profiler](http://www.yourkit.com/.net/profiler/index.jsp),
+innovative and intelligent tools for profiling Java and .NET applications.
+
+![YourKit Logo](https://cloud.githubusercontent.com/assets/1317309/4507430/7119527c-4b0c-11e4-9245-d72e751e26ee.png)
+
 ## License
 
 Copyright (c) 2011 Jonathan Leibiusky