summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Speedup: unblock clients on keys in O(1).o1-bpopantirez2020-04-084-23/+50
* Fix ACL HELP table missing comma.antirez2020-04-081-12/+12
* Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-04-071-0/+1
|\
| * Merge pull request #7064 from mymilkbottles/unstableSalvatore Sanfilippo2020-04-061-0/+1
| |\
| | * Merge pull request #1 from mymilkbottles/mymilkbottles-log-level-judgemymilkbottles2020-04-061-0/+1
| | |\
| | | * Judge the log level in advancemymilkbottles2020-04-061-0/+1
| | |/
* | | Speedup INFO by counting client memory incrementally.faster-infoantirez2020-04-074-26/+52
|/ /
* | Merge pull request #7065 from qetu3790/unstableSalvatore Sanfilippo2020-04-061-4/+1
|\ \
| * | fix comments about RESIZE DB opcode in rdb.c qetu37902020-04-061-4/+1
* | | Clarify redis.conf comment about lazyfree-lazy-user-del.antirez2020-04-061-5/+9
* | | Merge pull request #6243 from soloestoy/expand-lazy-free-server-delSalvatore Sanfilippo2020-04-064-2/+7
|\ \ \ | |/ / |/| |
| * | lazyfree: add a new configuration lazyfree-lazy-user-delzhaozhao.zz2019-12-184-2/+7
* | | Merge branch 'lcs' into unstableantirez2020-04-065-1/+267
|\ \ \ | |_|/ |/| |
| * | LCS: more tests.antirez2020-04-061-0/+8
| * | LCS: allow KEYS / STRINGS to be anywhere.antirez2020-04-061-6/+0
| * | LCS tests.antirez2020-04-061-0/+22
| * | LCS: get rid of STOREIDX option. Fix get keys helper.antirez2020-04-062-21/+20
| * | LCS: fix stale comment.lcsantirez2020-04-021-1/+1
| * | LCS: output LCS len as well in IDX mode.antirez2020-04-021-1/+6
| * | LCS: MINMATCHLEN and WITHMATCHLEN options.antirez2020-04-021-11/+24
| * | LCS: 7x speedup by accessing the array with better locality.antirez2020-04-011-1/+1
| * | LCS: implement KEYS option.antirez2020-04-011-2/+18
| * | LCS: other fixes to range emission.antirez2020-04-011-16/+20
| * | LCS: fix emission of last range starting at index 0.antirez2020-04-011-1/+1
| * | LCS: implement range indexes option.antirez2020-04-011-9/+59
| * | LCS: initial functionality implemented.antirez2020-04-014-1/+156
* | | Merge pull request #6797 from patpatbear/issue_#6565_memory_borderlineSalvatore Sanfilippo2020-04-063-4/+11
|\ \ \
| * | | Check OOM at script start to get stable lua OOM state.srzhao2020-01-203-4/+11
* | | | Merge pull request #7063 from oranagra/oran-runtest-externalSalvatore Sanfilippo2020-04-062-13/+13
|\ \ \ \
| * | | | diffrent fix for runtest --host --portOran Agra2020-04-062-13/+13
|/ / / /
* | | | Merge pull request #7051 from guybe7/sleep_in_blockonkeys_testsSalvatore Sanfilippo2020-04-031-1/+54
|\ \ \ \
| * | | | Try to fix time-sensitive tests in blockonkey.tclGuy Benoish2020-04-031-1/+54
* | | | | Merge pull request #7057 from guybe7/fix_attr_gnucSalvatore Sanfilippo2020-04-031-3/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use __attribute__ only if __GNUC__ is definedGuy Benoish2020-04-031-3/+12
|/ / / /
* | | | Merge pull request #6855 from guybe7/var_funcs_format_checkSalvatore Sanfilippo2020-04-031-3/+3
|\ \ \ \
| * | | | Modules: Perform printf-like format checks in variadic APIGuy Benoish2020-04-031-3/+3
* | | | | Merge pull request #7030 from valentinogeron/xread-in-luaSalvatore Sanfilippo2020-04-033-2/+18
|\ \ \ \ \
| * | | | | XREAD and XREADGROUP should not be allowed from scripts when BLOCK option is ...Valentino Geron2020-03-263-2/+18
* | | | | | Merge pull request #6933 from guybe7/multi_exec_allow_staleSalvatore Sanfilippo2020-04-031-3/+3
|\ \ \ \ \ \
| * | | | | | Stale replica should allow MULTI/EXECGuy Benoish2020-04-021-3/+3
* | | | | | | Merge pull request #7055 from zxdvd/patch-1Salvatore Sanfilippo2020-04-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fix integer overflowXudong Zhang2020-04-021-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #7054 from guybe7/fix_neg_zero_testSalvatore Sanfilippo2020-04-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix no-negative-zero testGuy Benoish2020-04-021-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #6694 from oranagra/signal_modified_keySalvatore Sanfilippo2020-04-024-8/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | modules don't signalModifiedKey in setKey() since that's done (optionally) in...Oran Agra2019-12-234-8/+8
* | | | | | | Merge pull request #6927 from oranagra/ci-moduleapi-testsSalvatore Sanfilippo2020-04-021-0/+2
|\ \ \ \ \ \ \
| * | | | | | | change CI to build and run the module api testsOran Agra2020-02-271-0/+2
* | | | | | | | Merge pull request #6654 from oranagra/fix_module_info_warningSalvatore Sanfilippo2020-04-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix possible warning on incomplete struct initOran Agra2019-12-101-1/+1