summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Test: processing of master stream in slave -BUSY state.slave-script-timeoutantirez2018-08-311-0/+44
* After slave Lua script leaves busy state, re-process the master buffer.antirez2018-08-312-2/+5
* While the slave is busy, just accumulate master input.antirez2018-08-302-1/+6
* Allow scripts to timeout even if from the master instance.antirez2018-08-301-11/+6
* Allow scripts to timeout on slaves as well.antirez2018-08-292-3/+10
* Merge pull request #4216 from lamby/did-not-received-typosSalvatore Sanfilippo2018-08-296-10/+10
|\
| * Correct "did not received" -> "did not receive" typos/grammar.Chris Lamb2018-08-266-10/+10
* | Merge pull request #5282 from soloestoy/remove-duplicate-bind-in-sentinel.confSalvatore Sanfilippo2018-08-291-10/+0
|\ \
| * | remove duplicate bind in sentinel.confzhaozhao.zz2018-08-271-10/+0
* | | Merge pull request #5296 from soloestoy/command-script-flag2Salvatore Sanfilippo2018-08-291-3/+3
|\ \ \
| * | | Supplement to PR #4835, just take info/memory/command as random commandszhaozhao.zz2018-08-291-3/+3
|/ / /
* | | Merge pull request #4835 from soloestoy/command-script-flagSalvatore Sanfilippo2018-08-291-14/+14
|\ \ \
| * | | some commands' flags should be set correctly, issue #4834zhaozhao.zz2018-08-291-14/+14
* | | | Merge pull request #5265 from oranagra/stabilize_testsSalvatore Sanfilippo2018-08-273-17/+23
|\ \ \ \
| * | | | Fix unstable tests on slow machines.Oran Agra2018-08-213-17/+23
* | | | | Document slave-ignore-maxmemory in redis.conf.antirez2018-08-271-0/+20
* | | | | Make slave-ignore-maxmemory configurable.antirez2018-08-271-0/+9
* | | | | Introduce repl_slave_ignore_maxmemory flag internally.antirez2018-08-273-0/+7
* | | | | Better variable meaning in processCommand().antirez2018-08-271-2/+2
* | | | | Re-apply rebased #2358.antirez2018-08-271-1/+1
* | | | | Fix build errors caused by #2358.antirez2018-08-271-11/+0
| |_|/ / |/| | |
* | | | Merge pull request #5248 from soloestoy/rewrite-brpoplpushSalvatore Sanfilippo2018-08-264-3/+7
|\ \ \ \
| * | | | block: format codezhaozhao.zz2018-08-141-2/+2
| * | | | block: rewrite BRPOPLPUSH as RPOPLPUSH to propagatezhaozhao.zz2018-08-143-1/+5
| |/ / /
* | | | Merge pull request #5244 from soloestoy/optimize-pipelineSalvatore Sanfilippo2018-08-263-54/+56
|\ \ \ \ | |_|_|/ |/| | |
| * | | networking: make setProtocolError simple and clearzhaozhao.zz2018-08-231-13/+11
| * | | networking: just move qb_pos instead of sdsrange in processInlineBufferzhaozhao.zz2018-08-141-3/+2
| * | | networking: just return C_OK if multibulk processing saw a <= 0 length.zhaozhao.zz2018-08-141-5/+2
| * | | adjust qbuf to 26 in test case for client listzhaozhao.zz2018-08-141-1/+1
| * | | pipeline: do not sdsrange querybuf unless all commands processedzhaozhao.zz2018-08-142-40/+48
| |/ /
* | | Merge pull request #2992 from lamby/source-date-epochSalvatore Sanfilippo2018-08-261-0/+3
|\ \ \
| * | | Use SOURCE_DATE_EPOCH over unreproducible uname + date calls.Chris Lamb2016-04-291-0/+3
* | | | Merge pull request #2358 from lamby/config-set-maxmemory-grammarSalvatore Sanfilippo2018-08-261-0/+11
|\ \ \ \
| * \ \ \ Merge branch 'unstable' into config-set-maxmemory-grammarChris Lamb2018-08-25563-38770/+106308
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Tidy grammar in CONFIG SET maxmemory warning.Chris Lamb2015-02-041-1/+1
| | |/ / | |/| |
* | | | Merge pull request #2292 from lamby/sentinel-conf-defaultsSalvatore Sanfilippo2018-08-261-0/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Make some defaults explicit in the sentinel.conf for package maintainersChris Lamb2015-01-161-0/+25
| |/ /
* | | Merge pull request #5146 from 0xtonyxia/fix-xclaim-id-parseSalvatore Sanfilippo2018-08-031-1/+1
|\ \ \
| * | | Streams: ID of xclaim command starts from the sixth argument.dejun.xdj2018-07-191-1/+1
* | | | Merge pull request #5151 from shenlongxing/fix-streamSalvatore Sanfilippo2018-08-032-7/+7
|\ \ \ \
| * | | | Fix stream command parasshenlongxing2018-08-032-7/+7
* | | | | Fix AOF comment to report the current behavior.antirez2018-08-031-1/+3
* | | | | Test suite: add --loop option.antirez2018-08-021-5/+12
* | | | | Test suite: new --stop option.antirez2018-08-021-4/+13
* | | | | Test: new sorted set skiplist order consistency.antirez2018-08-021-0/+26
* | | | | Fix zslUpdateScore() edge case.antirez2018-08-011-2/+2
* | | | | More commenting of zslUpdateScore().antirez2018-08-011-0/+2
* | | | | Explain what's the point of zslUpdateScore() in top comment.antirez2018-08-011-0/+5
* | | | | Remove old commented zslUpdateScore() from source.antirez2018-08-011-13/+0
* | | | | Optimize zslUpdateScore() as asked in #5179.antirez2018-08-011-0/+44