Merge branch 'binaryAPI' of git://github.com/yaourt/jedis

Browse Source

Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java

...

This commit is contained in:

Jonathan Leibiusky

2010-11-15 23:55:57 -03:00

parent f62548931c d3362da12c

commit b013a74c44

41 changed files with 8489 additions and 2326 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

943

src/main/java/redis/clients/jedis/Client.java

File diff suppressed because it is too large Load Diff