Merge branch 'cluster' of github.com:marcosnils/jedis into marcosnils-cluster

Browse Source

Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/Protocol.java

...

This commit is contained in:

Jonathan Leibiusky

2014-01-16 16:35:04 -05:00

parent 46734e646a 6c8d7a5045

commit 842dcd2a95

25 changed files with 2513 additions and 80 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1432

src/main/java/redis/clients/jedis/JedisCluster.java Normal file

File diff suppressed because it is too large Load Diff