 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 |
|
|
jonathan pickett
|
1c3b70c971
|
Finishing merge of branch '2.8.4_msopen' of https://github.com/MSOpenTech/redis into 2.8.4_msopen
Conflicts:
bin/release/redis-2.8.4.zip
src/Win32_Interop/Win32_QFork.cpp
src/sds.c
|
2014-05-16 12:49:22 -07:00 |
|
|
jonathan pickett
|
3cd77a5cb5
|
fox for issue 84. now recognizing "stdout" as as stdout. Also added docs to binary zip generation script and modified redis.windows.conf to remove references to unsupported daemonize flag
|
2014-04-15 16:21:39 -07:00 |
|
|
jonathan pickett
|
0df3c6b4b4
|
Updated the README.md for the current build. Removed APIBridge.dll from the powershell script that builds the zip file containing the binaries. Updated the zip file.
|
2014-04-01 17:11:17 -07:00 |
|
|
jonathan pickett
|
411ef3f609
|
Cleaned up duplicate WIN32_IOCP flag in projects. Also added compressOutputToReleaseFolder.ps1 script to release build of Redis.
|
2014-02-25 18:03:23 -08:00 |
|