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
..
2014-07-01 22:54:48 -07:00
2012-05-25 16:25:07 +02:00
2013-02-12 16:25:47 +01:00
2014-06-18 16:25:45 +02:00
2014-01-07 17:04:52 -08:00
2013-07-21 11:54:30 -07:00
2014-03-05 10:16:02 +01:00
2014-01-09 11:19:11 +01:00
2014-01-03 19:45:45 -08:00
2014-05-19 15:45:24 +02:00
2014-01-06 17:31:47 -08:00
2012-04-18 11:41:03 +02:00
2011-07-28 12:32:52 +02:00
2013-11-25 10:21:18 +01:00
2014-01-06 17:31:47 -08:00
2013-10-29 19:21:02 -07:00
2014-01-07 17:04:52 -08:00
2011-05-20 11:44:54 +02:00
2014-02-03 17:06:54 -08:00
2014-01-08 17:16:09 +01:00
2010-10-15 12:54:53 +02:00
2013-11-05 17:24:26 +01:00
2014-06-16 10:30:42 +02:00
2013-01-19 12:55:15 +01:00
2014-06-06 10:44:08 +02:00