Merge branch 'cluster-revised' into cluster-support-multi-key-new

Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedisCluster.java
	src/main/java/redis/clients/jedis/JedisCluster.java

Author: HeartSaVioR

.travis.yml

@@ -3,5 +3,6 @@ jdk:
   - openjdk6
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 install: make travis-install
 script: make test

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!

Makefile

@@ -289,11 +289,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

@@ -48,7 +48,7 @@ Or use it as a maven dependency:
 <dependency>
     <groupId>redis.clients</groupId>
     <artifactId>jedis</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.2</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