summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | 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
| * | | ACL LOG: log failed auth attempts.antirez2020-02-045-12/+34
| * | | ACL LOG: implement a few basic tests.antirez2020-01-301-0/+87
| * | | ACL LOG: also log ACL errors in the scripting/MULTI ctx.antirez2020-01-302-2/+6
| * | | ACL LOG: implement LOG RESET.antirez2020-01-291-2/+6
| * | | ACL LOG: group similar entries in a given time delta.antirez2020-01-291-3/+58
| * | | ACL LOG: actually emit entries.antirez2020-01-283-5/+34
| * | | ACL LOG: implement ACL LOG subcommadn skeleton.antirez2020-01-281-0/+37
| * | | ACL LOG: data structures and initial functions.antirez2020-01-275-5/+54
* | | | Merge pull request #6818 from leomurillo/zskiplistLevelsSalvatore Sanfilippo2020-02-041-1/+1
|\ \ \ \
| * | | | Set ZSKIPLIST_MAXLEVEL to optimal value given 2^64 elements and p=0.25Leo Murillo2020-02-021-1/+1
* | | | | Merge pull request #6825 from trevor211/fixMemoryLeakAboutLuaScriptSalvatore Sanfilippo2020-02-042-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix lua related memory leak.WuYunlong2020-02-041-0/+1
| * | | | Add tcl regression test in scripting.tcl to reproduce memory leak.WuYunlong2020-02-041-0/+5
|/ / / /
* | | | Merge pull request #6808 from yossigo/fix/redis-cli-openssl-1.0.xSalvatore Sanfilippo2020-02-031-0/+9
|\ \ \ \
| * | | | TLS: Fix missing initialization in redis-cli.Yossi Gottlieb2020-01-291-0/+9
* | | | | Merge pull request #6824 from oranagra/fix_module_c_uninit_varSalvatore Sanfilippo2020-02-031-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix uninitialized info_cb var in module.cOran Agra2020-02-031-0/+1
|/ / / /
* | | | Merge pull request #6812 from guybe7/str_convert_fixSalvatore Sanfilippo2020-01-305-11/+20
|\ \ \ \ | |/ / / |/| | |
| * | | ld2string should fail if string contains \0 in the middleGuy Benoish2020-01-305-11/+20
| | |/ | |/|
* | | Add more info in the unblockClientFromModule() function.antirez2020-01-291-1/+7
|/ /
* | Merge pull request #6699 from guybe7/module_blocked_on_key_timeout_memleakSalvatore Sanfilippo2020-01-293-6/+51
|\ \ | |/ |/|
| * Modules: Fix blocked-client-related memory leakGuy Benoish2019-12-303-6/+51
* | Change error message for #6775.antirez2020-01-151-2/+2
* | Merge pull request #6775 from SqREL/make-error-of-invalid-command-withing-con...Salvatore Sanfilippo2020-01-151-1/+4
|\ \
| * | Make error when submitting command in incorrect context more explicitVasyl Melnychuk2020-01-101-1/+4
* | | Document I/O threads in redis.conf.antirez2020-01-131-0/+46
* | | Setting N I/O threads should mean N-1 additional + 1 main thread.antirez2020-01-131-22/+25
* | | Simplify #6379 changes.antirez2020-01-132-9/+4
* | | Merge pull request #6739 from trevor211/fixMemoryLeakSalvatore Sanfilippo2020-01-133-6/+25
|\ \ \
| * | | Free allocated sds in pfdebugCommand() to avoid memory leak.WuYunlong2020-01-071-0/+1
| * | | Fix potential memory leak of clusterLoadConfig().WuYunlong2020-01-071-5/+20
| * | | Fix potential memory leak of rioWriteBulkStreamID().WuYunlong2020-01-061-1/+4
* | | | Jump to right label on AOF parsing error.antirez2020-01-131-4/+6
* | | | Port PR #6110 to new connection object code.antirez2020-01-131-2/+2
* | | | A few comments about main thread serving I/O as well.antirez2020-01-131-1/+7
* | | | Merge pull request #6110 from soloestoy/enhance-io-threadedSalvatore Sanfilippo2020-01-131-3/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Threaded IO: use main thread to handle read workzhaozhao.zz2019-05-211-1/+8
| * | | Threaded IO: use main thread to handle write workzhaozhao.zz2019-05-211-2/+10
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-01-103-2/+9
|\ \ \ \
| * \ \ \ Merge pull request #6114 from ShooterIT/async-rename-rdbSalvatore Sanfilippo2020-01-101-0/+7
| |\ \ \ \