summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Redis 5.0 RC1.5.0-rc1antirez2018-05-292-12/+83
* Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2018-05-291-2/+2
|\
| * Merge pull request #4948 from soloestoy/avoid-warning-streamSalvatore Sanfilippo2018-05-251-2/+2
| |\
| | * avoid warning in t_stream.czhaozhao.zz2018-05-251-2/+2
* | | Don't expire keys while loading RDB from AOF preamble.antirez2018-05-293-5/+5
* | | Fix rdb save by allowing dumping of expire keys, so that whenWuYunlong2018-05-292-7/+3
* | | Streams: fix comments referring to old ID format.antirez2018-05-251-2/+2
|/ /
* | Streams: fix test ID format.antirez2018-05-251-4/+4
|/
* Backport hiredis issue 525 fix to compile on FreeBSD.antirez2018-05-251-1/+1
* Simplify XADD ID syntax error code path,.antirez2018-05-251-6/+3
* Merge pull request #4832 from 0xtonyxia/fix-xadd-ID-parseSalvatore Sanfilippo2018-05-251-4/+5
|\
| * Return more accurate message when specified ID is invaliddejun.xdj2018-04-101-2/+1
| * Bugfix: xadd command ID parsedejun.xdj2018-04-101-2/+4
* | Avoid warning by explicitly initializing var to NULL.antirez2018-05-251-1/+1
* | Explicitly cast void pointers to char pointers for printf style logging.antirez2018-05-251-6/+6
* | Merge pull request #4946 from soloestoy/linux-make-lrtSalvatore Sanfilippo2018-05-251-1/+1
|\ \
| * | append -lrt to FINAL_LIBS for linuxzhaozhao.zz2018-05-251-1/+1
|/ /
* | Don't append libjemalloc.a otherwise it will be after -ldl.antirez2018-05-251-1/+1
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2018-05-244-15/+37
|\ \
| * \ Merge pull request #4099 from JunHe77/aarch64_stack_cflagSalvatore Sanfilippo2018-05-242-1/+3
| |\ \
| | * | Fixed stack trace generation on aarch64Jun He2017-07-032-1/+3
| * | | Merge pull request #4932 from 0xtonyxia/fix-redis-cli-set-prefer-memory-leakSalvatore Sanfilippo2018-05-241-0/+2
| |\ \ \
| | * | | Fix redis-cli memory leak when sending set preference command.dejun.xdj2018-05-211-0/+2
| * | | | Merge pull request #4922 from 0xtonyxia/enhance-cli-securitySalvatore Sanfilippo2018-05-241-13/+31
| |\ \ \ \
| | * | | | Check if the repeat value is positive in while loop of cliSendCommand().dejun.xdj2018-05-211-1/+1
| | * | | | Change the type of repeat argument to long for function cliSendCommand.dejun.xdj2018-05-211-1/+1
| | * | | | Fix negtive repeat command value issue.dejun.xdj2018-05-191-3/+11
| | * | | | Detect and stop saving history for auth command with repeat option.dejun.xdj2018-05-181-10/+17
| | * | | | Change the warning message a little bit to avoid trademark issuses.dejun.xdj2018-05-181-1/+1
| | * | | | Stop saving auth command in redis-cli history.dejun.xdj2018-05-161-2/+4
| | * | | | Add warning message when using password on command linedejun.xdj2018-05-161-0/+1
| | |/ / /
| * | | | Merge pull request #4831 from 0xtonyxia/fix-xadd-arity-checkSalvatore Sanfilippo2018-05-241-1/+1
| |\ \ \ \
| | * | | | Bugfix: xadd comand <field,value> arity checkdejun.xdj2018-04-101-1/+1
| | | |_|/ | | |/| |
* | | | | Generate configure for Jemalloc.antirez2018-05-243-0/+13746
* | | | | Make active defragmentation tests optional.antirez2018-05-242-57/+66
* | | | | Add --with-version in Jemalloc config script.antirez2018-05-241-1/+1
* | | | | Specify that Jemalloc configure requires version.antirez2018-05-241-5/+10
* | | | | Jemalloc upgraded to version 5.0.1.antirez2018-05-24300-34631/+40603
* | | | | Update documentation about how to upgrade Jemalloc.antirez2018-05-241-3/+20
|/ / / /
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2018-05-231-7/+9
|\ \ \ \
| * \ \ \ Merge pull request #4908 from soloestoy/aof-rdb-preamble-compatible-checksum-noSalvatore Sanfilippo2018-05-231-7/+9
| |\ \ \ \
| | * | | | AOF & RDB: be compatible with rdbchecksum nozhaozhao.zz2018-05-081-7/+9
* | | | | | Sentinel: fix delay in detecting ODOWN.antirez2018-05-231-5/+9
|/ / / / /
* | | | | Merge pull request #4935 from soloestoy/bugfix-zpopSalvatore Sanfilippo2018-05-221-4/+4
|\ \ \ \ \
| * | | | | ZPOP: fix the wrong keyc, should be 1zhaozhao.zz2018-05-221-4/+4
|/ / / / /
* | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2018-05-174-8/+13
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4927 from oranagra/defrag_32bit_fixSalvatore Sanfilippo2018-05-174-8/+13
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Active defrag fixes for 32bit buildsOran Agra2018-05-174-8/+13
* | | | | | Merge remote-tracking branch 'artix/trib2cli' into unstableantirez2018-05-176-18/+3703
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removed TODO in redis-cliartix2018-05-161-1/+0