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
antirez
ebc62a6f35
Jemalloc updated to 3.6.0.
...
Not a single bug in about 3 months, and our previous version was
too old (3.2.0).
2014-06-20 15:01:36 +02:00
Jonathan Pickett
62cc0e320d
Merge branch '2_6_14_rebase' into 2.8.4
...
Conflicts:
00-RELEASENOTES
deps/hiredis/hiredis.c
deps/hiredis/sds.c
deps/jemalloc/ChangeLog
deps/jemalloc/Makefile.in
deps/jemalloc/VERSION
deps/jemalloc/configure
deps/jemalloc/configure.ac
deps/jemalloc/doc/jemalloc.3
deps/jemalloc/doc/jemalloc.html
deps/jemalloc/doc/jemalloc.xml.in
deps/jemalloc/include/jemalloc/internal/arena.h
deps/jemalloc/include/jemalloc/internal/chunk.h
deps/jemalloc/include/jemalloc/internal/chunk_dss.h
deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
deps/jemalloc/include/jemalloc/internal/ctl.h
deps/jemalloc/include/jemalloc/internal/extent.h
deps/jemalloc/include/jemalloc/internal/huge.h
deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in
deps/jemalloc/include/jemalloc/internal/private_namespace.h
deps/jemalloc/include/jemalloc/internal/prof.h
deps/jemalloc/include/jemalloc/internal/rtree.h
deps/jemalloc/include/jemalloc/jemalloc.h.in
deps/jemalloc/include/jemalloc/jemalloc_defs.h.in
deps/jemalloc/src/arena.c
deps/jemalloc/src/base.c
deps/jemalloc/src/chunk.c
deps/jemalloc/src/chunk_dss.c
deps/jemalloc/src/chunk_mmap.c
deps/jemalloc/src/ctl.c
deps/jemalloc/src/huge.c
deps/jemalloc/src/jemalloc.c
deps/jemalloc/src/mutex.c
deps/jemalloc/src/prof.c
deps/jemalloc/src/rtree.c
deps/jemalloc/src/stats.c
deps/jemalloc/src/tcache.c
deps/jemalloc/src/util.c
deps/jemalloc/src/zone.c
deps/jemalloc/test/thread_arena.c
deps/linenoise/linenoise.c
redis.conf
src/Makefile.dep
src/ae.c
src/anet.c
src/anet.h
src/aof.c
src/bitops.c
src/config.c
src/config.h
src/db.c
src/debug.c
src/dict.c
src/memtest.c
src/mkreleasehdr.sh
src/networking.c
src/object.c
src/rdb.c
src/redis-benchmark.c
src/redis-cli.c
src/redis.c
src/redis.h
src/release.c
src/replication.c
src/rio.c
src/rio.h
src/scripting.c
src/sds.c
src/sentinel.c
src/t_list.c
src/t_string.c
src/t_zset.c
src/version.h
src/zmalloc.c
tests/assets/default.conf
tests/integration/rdb.tcl
tests/test_helper.tcl
tests/unit/basic.tcl
tests/unit/expire.tcl
tests/unit/obuf-limits.tcl
tests/unit/pubsub.tcl
tests/unit/scripting.tcl
Still having problems with BLPOP
2014-02-03 17:06:54 -08:00
Henry Rawas
11d870bd55
Redis 2.6 for Windows
2013-07-21 11:54:30 -07:00
antirez
0e3baa5241
Redis/Jemalloc Gitignore were too aggressive.
...
Redis gitignore was too aggressive since simply broken.
Jemalloc gitignore was too agressive because it is conceived to just
keep the files that allow to generate all the rest in development
environments (so for instance the "configure" file is excluded).
2013-04-18 16:23:12 +02:00
antirez
5bf9b53a83
Redis/Jemalloc Gitignore were too aggressive.
...
Redis gitignore was too aggressive since simply broken.
Jemalloc gitignore was too agressive because it is conceived to just
keep the files that allow to generate all the rest in development
environments (so for instance the "configure" file is excluded).
2013-04-18 16:21:32 +02:00
antirez
21b26915ce
Jemalloc updated to version 3.2.0.
2012-11-28 18:42:41 +01:00
antirez
053f1f357d
Jemalloc updated to version 3.2.0.
2012-11-28 18:42:35 +01:00
antirez
4934f93dfb
Jemalloc updated to 3.0.0.
...
Full changelog here:
http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git;a=blob_plain;f=ChangeLog;hb=master
Notable improvements from the point of view of Redis:
1) Bugfixing.
2) Support for Valgrind.
3) Support for OSX Lion, FreeBSD.
2012-05-16 11:20:44 +02:00
antirez
86de66e32f
jemalloc gitignore updated to jemalloc 2.2.5
2011-11-25 16:42:10 +01:00
jbergstroem
1d03c1c98a
Update to jemalloc 2.2.5
2011-11-23 21:36:25 +01:00
Pieter Noordhuis
b4a79b9ffc
Ignore jemalloc build artifacts
2011-06-20 11:38:25 +02:00
antirez
a78e148b7d
jemalloc source added
2011-06-20 11:30:06 +02:00