jonathan pickett
96e0be50bb
Merge branch '2.8antirez' into 2.8. Updates version from 2.8.9 to 2.8.12.
Conflicts:
deps/hiredis/async.c
deps/hiredis/examples/example-ae.c
deps/hiredis/hiredis.c
deps/hiredis/hiredis.h
deps/hiredis/net.c
deps/hiredis/net.h
deps/jemalloc/COPYING
deps/jemalloc/INSTALL
deps/jemalloc/README
deps/jemalloc/bin/pprof
deps/jemalloc/config.guess
deps/jemalloc/config.sub
deps/jemalloc/include/jemalloc/internal/ckh.h
deps/jemalloc/include/jemalloc/internal/hash.h
deps/jemalloc/include/jemalloc/internal/prng.h
deps/jemalloc/include/jemalloc/internal/ql.h
deps/jemalloc/include/jemalloc/internal/qr.h
deps/jemalloc/include/jemalloc/internal/quarantine.h
deps/jemalloc/include/jemalloc/internal/rb.h
deps/jemalloc/include/jemalloc/internal/tcache.h
deps/jemalloc/include/jemalloc/internal/tsd.h
deps/jemalloc/include/jemalloc/internal/util.h
deps/jemalloc/src/bitmap.c
deps/jemalloc/src/ckh.c
deps/jemalloc/src/quarantine.c
deps/jemalloc/src/tsd.c
deps/jemalloc/test/integration/aligned_alloc.c
deps/jemalloc/test/unit/bitmap.c
src/aof.c
src/redis-cli.c
src/redis.h
src/util.c
2014-07-01 22:54:48 -07:00
..
2011-09-16 11:25:05 +02:00
2014-07-01 22:54:48 -07:00
2012-03-25 10:57:34 +02:00
2014-02-11 18:49:40 -08:00
2010-08-25 14:48:50 +02:00
2014-07-01 22:54:48 -07:00
2014-02-03 17:06:54 -08:00
2014-02-03 17:06:54 -08:00
2014-03-21 18:45:33 -07:00
2014-07-01 22:54:48 -07:00