jonathan pickett 8cb1d65616 Merge branch '2.8antirez' into 2.8: raise version from 2.8.12 to 2.8.13 ...

Conflicts:
	src/Makefile.dep
	src/aof.c
	src/redis-cli.c
	tests/instances.tcl
	tests/integration/replication.tcl

2014-07-28 18:10:57 -07:00

..

default.conf

Merge branch '2.8antirez' into 2.8: raise version from 2.8.12 to 2.8.13

2014-07-28 18:10:57 -07:00

encodings.rdb

RDB load of different encodings test added.

2012-03-23 15:23:01 +01:00

hash-zipmap.rdb

Test that zipmap from RDB is correctly converted

2012-01-25 13:28:11 -08:00