git.saurik.com Git - redis.git/commit

]> git.saurik.com Git - redis.git/commit

projects / redis.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 250e7f6 d3ea4c8)

author	antirez <antirez@gmail.com>
	Fri, 9 Mar 2012 21:07:45 +0000 (22:07 +0100)
committer	antirez <antirez@gmail.com>
	Fri, 9 Mar 2012 21:07:45 +0000 (22:07 +0100)
commit	8562798308391d489016b3995d438b6187b5980a
tree	66fb2833e0cbbed0e3436fb5f72d7635860f6b11	tree \| snapshot
parent	250e7f690825f506306e3c091ba4465c206726bd	commit \| diff
parent	d3ea4c86a8c8efb2ab922db89af915833e437e7e	commit \| diff

Merge conflicts resolved.

redis.conf	diff1 \|	diff2 \|	blob \| history
src/aof.c	diff1 \|	diff2 \|	blob \| history
src/config.c	diff1 \|	diff2 \|	blob \| history
src/rdb.c	diff1 \|	diff2 \|	blob \| history
src/redis.c	diff1 \|	diff2 \|	blob \| history
src/redis.h	diff1 \|	diff2 \|	blob \| history
src/t_hash.c	diff1 \|	diff2 \|	blob \| history
src/util.c	diff1 \|	diff2 \|	blob \| history
src/ziplist.c	diff1 \|	diff2 \|	blob \| history
tests/unit/type/hash.tcl	diff1 \|	diff2 \|	blob \| history

Redis += OpenLDAP MDB