summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | correct help info for --user and --passlifubang2020-02-121-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6875 from WOOSEUNGHOON/cve20158080_fixSalvatore Sanfilippo2020-02-101-4/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | [FIX] revisit CVE-2015-8080 vulnerabilitySeunghoon Woo2020-02-101-4/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6822 from guybe7/diskless_load_module_hook_fixSalvatore Sanfilippo2020-02-063-28/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Diskless-load emptyDb-related fixesGuy Benoish2020-02-063-28/+44
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-02-0618-217/+187
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #6826 from lifubang/opensslcliSalvatore Sanfilippo2020-02-061-9/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix ssl flag check for redis-clilifubang2020-02-041-9/+10
| * | | | | | | | | | Merge pull request #6821 from guybe7/key_miss_notifySalvatore Sanfilippo2020-02-065-7/+12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Exclude "keymiss" notification from NOTIFY_ALLGuy Benoish2020-02-035-7/+12
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #6837 from oranagra/signal_modified_key_docSalvatore Sanfilippo2020-02-061-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | update RM_SignalModifiedKey doc commentOran Agra2020-02-051-1/+2
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #6840 from oranagra/short_read_moduleidSalvatore Sanfilippo2020-02-061-1/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add handling of short read of module id in rdbOran Agra2020-02-051-1/+4
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #6841 from yossigo/tls-doc-updateSalvatore Sanfilippo2020-02-062-31/+32
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | TLS: Update documentation.Yossi Gottlieb2020-02-052-31/+32
| * | | | | | | | | | | Merge pull request #6843 from oranagra/command_flagsSalvatore Sanfilippo2020-02-061-8/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | A few non-data commands that should be allowed while loading or staleOran Agra2020-02-061-8/+8
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #6844 from oranagra/bind_config_leakSalvatore Sanfilippo2020-02-061-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Memory leak when bind config is provided twiceOran Agra2020-02-061-0/+4
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6845 from oranagra/maxmemory_warningSalvatore Sanfilippo2020-02-061-2/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fix maxmemory config warningOran Agra2020-02-061-2/+3
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6846 from oranagra/module_client_flagsSalvatore Sanfilippo2020-02-061-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix client flags to be int64 in module.cOran Agra2020-02-061-3/+3
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6847 from oranagra/module_read_err_panicSalvatore Sanfilippo2020-02-061-4/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | moduleRDBLoadError, add key name, and use panic rather than exitOran Agra2020-02-061-4/+5
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6848 from oranagra/opt_use_diskless_load_callsSalvatore Sanfilippo2020-02-061-4/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | reduce repeated calls to use_diskless_loadOran Agra2020-02-061-4/+3
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6849 from oranagra/free_client_mutexSalvatore Sanfilippo2020-02-061-1/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | freeClientAsync don't lock mutex if there's just one threadOran Agra2020-02-061-1/+6
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6850 from oranagra/restart_aof_unset_masterSalvatore Sanfilippo2020-02-061-3/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | move restartAOFAfterSYNC from replicaofCommand to replicationUnsetMasterOran Agra2020-02-061-3/+4
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6851 from oranagra/aof_rewrite_scheduledSalvatore Sanfilippo2020-02-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | stopAppendOnly resets aof_rewrite_scheduledOran Agra2020-02-061-0/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6852 from oranagra/acl_helpSalvatore Sanfilippo2020-02-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | add SAVE subcommand to ACL HELP and top commentOran Agra2020-02-061-0/+2
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6853 from oranagra/debug_helpSalvatore Sanfilippo2020-02-061-2/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | DEBUG HELP - add PROTOCOLOran Agra2020-02-061-2/+3
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6854 from guybe7/mem_overhead_miscalcSalvatore Sanfilippo2020-02-063-32/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Some refactroing using getClientType instead of CLIENT_SLAVEGuy Benoish2020-02-062-26/+18
| | * | | | | | | | | | Fix small bugs related to replica and monitor ambiguityGuy Benoish2020-02-062-6/+8
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #6839 from yossigo/fix/redis-conf-tls-clarificationsSalvatore Sanfilippo2020-02-051-11/+10
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | TLS: Some redis.conf clarifications.Yossi Gottlieb2020-02-051-11/+10
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #6831 from oranagra/config_c_refactor_3Salvatore Sanfilippo2020-02-051-97/+31
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | config.c verbose error replies for CONFIG SET, like config file parsingOran Agra2020-02-051-97/+31
| * | | | | | | | | | Merge pull request #6829 from oranagra/memory_get_keysSalvatore Sanfilippo2020-02-053-1/+18
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | memoryGetKeys helper function so that ACL can limit access to keys for MEMORY...Oran Agra2020-02-053-1/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'acl-log' into unstableantirez2020-02-067-5/+320
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | ACL LOG: make max log entries configurable.acl-logantirez2020-02-044-0/+19
| * | | | | | | | | ACL LOG: test for AUTH reason.antirez2020-02-041-0/+9