summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'unstable' into conductconductItamar Haber2020-07-1028-196/+488
|\
| * fix: typo in CI job name (#7466)Abhishek Soni2020-07-101-1/+1
| * Fix typo in deps README (#7500)Jiayuan Chen2020-07-101-1/+1
| * Add missing latency-monitor tcl test to test_helper.tcl. (#6782)WuYunlong2020-07-101-0/+1
| * TLS: Session caching configuration support. (#7420)Yossi Gottlieb2020-07-106-16/+56
| * TLS: Ignore client cert when tls-auth-clients off. (#7457)Yossi Gottlieb2020-07-101-3/+1
| * Use pkg-config to properly detect libssl and libcrypto libraries (#7452)James Hilliard2020-07-101-3/+15
| * TLS: Add missing redis-cli options. (#7456)Yossi Gottlieb2020-07-103-52/+166
| * redis-cli --hotkeys fixed to handle non-printable key namesOran Agra2020-07-101-5/+11
| * redis-cli --bigkeys fixed to handle non-printable key namesOran Agra2020-07-101-16/+24
| * RESTORE ABSTTL won't store expired keys into the db (#7472)Oran Agra2020-07-104-16/+46
| * defrag.c activeDefragSdsListAndDict when defrag sdsele, We can't use (#7492)huangzhw2020-07-101-1/+1
| * skip a test that uses +inf on valgrind (#7440)Oran Agra2020-07-101-9/+12
| * stabilize tests that look for log lines (#7367)Oran Agra2020-07-103-11/+33
| * tests/valgrind: don't use debug restart (#7404)Oran Agra2020-07-104-57/+114
| * change references to the github repo location (#7479)Oran Agra2020-07-105-7/+7
| * BITOP: propagate only when it really SET or DEL targetkey (#5783)zhaozhao.zz2020-07-101-1/+2
* | Adds email address to conductItamar Haber2020-07-101-1/+1
* | Adds code of conductItamar Haber2020-07-092-12/+109
|/
* Update comment to clarify change in #7398.antirez2020-06-251-1/+4
* Merge pull request #7398 from caiyuxinggg/workSalvatore Sanfilippo2020-06-251-1/+1
|\
| * cluster.c remove if of clusterSendFail in markNodeAsFailingIfNeededroot2020-06-151-1/+1
* | Merge pull request #7426 from dnielsen/patch-1Salvatore Sanfilippo2020-06-251-1/+1
|\ \
| * | updated copyright yearDave Nielsen2020-06-231-1/+1
* | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-06-246-91/+204
|\ \ \ | |/ /
| * | Merge pull request #7390 from oranagra/exec_fails_abortSalvatore Sanfilippo2020-06-236-91/+204
| |\ \
| | * | EXEC always fails with EXECABORT and multi-state is clearedOran Agra2020-06-236-91/+204
* | | | LPOS: option FIRST renamed RANK.antirez2020-06-242-19/+19
|/ / /
* | | Include cluster.h for getClusterConnectionsCount().antirez2020-06-221-0/+1
* | | Fix BITFIELD i64 type handling, see #7417.antirez2020-06-221-6/+8
* | | Clarify maxclients and cluster in conf. Remove myself too.antirez2020-06-222-1/+9
* | | Merge pull request #7421 from hwware/sentinel_leak_fixSalvatore Sanfilippo2020-06-221-0/+1
|\ \ \
| * | | fix memory leak in sentinel connection sharinghwware2020-06-211-0/+1
|/ / /
* | | Merge pull request #7402 from chenhui0212/unstableSalvatore Sanfilippo2020-06-182-4/+4
|\ \ \
| * | | Fix comments in function raxLowWalk of listpack.cchenhui02122020-06-181-2/+2
| * | | fix comments in listpack.cchenhui02122020-06-161-2/+2
| | |/ | |/|
* | | Merge pull request #7411 from tporadowski/inconsitent-sentinel-nosaveSalvatore Sanfilippo2020-06-182-8/+9
|\ \ \
| * | | ensure SHUTDOWN_NOSAVE in Sentinel modeTomasz Poradowski2020-06-172-8/+9
|/ / /
* | | Use cluster connections too, to limit maxclients.antirez2020-06-163-8/+23
* | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-06-163-7/+24
|\ \ \
| * \ \ Merge pull request #7396 from MeirShpilraien/fix_dict_scan_module_apiSalvatore Sanfilippo2020-06-153-7/+24
| |\ \ \ | | |/ / | |/| |
| | * | Fix RM_ScanKey module api not to return int encoded stringsmeir@redislabs.com2020-06-143-7/+24
| |/ /
* | | Tracking: fix enableBcastTrackingForPrefix() invalid sdslen() call.antirez2020-06-161-1/+1
|/ /
* | Fix LCS object type checking. Related to #7379.antirez2020-06-121-10/+17
* | Merge pull request #7375 from hwware/lcs_crash_fixSalvatore Sanfilippo2020-06-121-8/+14
|\ \
| * | fix memory leakhwware2020-06-111-12/+11
| * | fix server crash in STRALGO commandhwware2020-06-081-0/+7
* | | help.h updated.antirez2020-06-121-10/+20
* | | LPOS: tests + crash fix.lposantirez2020-06-112-1/+45
* | | LPOS: update to latest proposal.antirez2020-06-111-40/+59