Jungtaek Lim 1877185153 Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status ...

* it's broken with later features, resetState()
* fixed resetState() to make it work with this PR

Conflicts:
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Pipeline.java
	src/main/java/redis/clients/jedis/Transaction.java
	src/main/java/redis/clients/jedis/TransactionBlock.java

2014-08-08 10:46:43 +09:00

..

jedis

Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status

2014-08-08 10:46:43 +09:00

util

fix build after CLUSTER NODES output has been changed

2014-07-02 07:42:29 +09:00