summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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 branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-06-244-67/+94
|\ \
| * \ Merge pull request #7390 from oranagra/exec_fails_abortSalvatore Sanfilippo2020-06-234-67/+94
| |\ \
| | * | EXEC always fails with EXECABORT and multi-state is clearedOran Agra2020-06-234-67/+94
* | | | LPOS: option FIRST renamed RANK.antirez2020-06-241-5/+5
|/ / /
* | | 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-221-1/+4
* | | 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
| | |/ | |/|
* | | 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-161-3/+3
|\ \ \
| * | | Fix RM_ScanKey module api not to return int encoded stringsmeir@redislabs.com2020-06-141-3/+3
| |/ /
* | | 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-111-1/+1
* | | LPOS: update to latest proposal.antirez2020-06-111-40/+59
* | | LPOS: implement the final design.antirez2020-06-103-22/+85
* | | LRANK: Add command (the command will be renamed LPOS).Paul Spooren2020-06-104-0/+44
| |/ |/|
* | Temporary fix for #7353 issue about EVAL during -BUSY.antirez2020-06-091-0/+9
|/
* Merge pull request #7363 from xhebox/unstableSalvatore Sanfilippo2020-06-081-1/+1
|\
| * return the correct proto versionxhe2020-06-071-1/+1
* | Merge pull request #7370 from oranagra/no_queue_in_aborted_multiSalvatore Sanfilippo2020-06-081-0/+7
|\ \
| * | Don't queue commands in an already aborted MULTI stateOran Agra2020-06-081-0/+7
| |/
* | Merge pull request #7369 from oranagra/no_reject_watchSalvatore Sanfilippo2020-06-081-2/+4
|\ \
| * | Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARDOran Agra2020-06-081-2/+4
| |/
* | Merge pull request #7357 from soloestoy/bugfix-aof-keepttlSalvatore Sanfilippo2020-06-081-8/+13
|\ \
| * | AOF: append origin SET if no expire optionzhaozhao.zz2020-06-031-8/+13
* | | Merge pull request #7371 from oranagra/fix_disconnectSlavesSalvatore Sanfilippo2020-06-081-1/+0
|\ \ \
| * | | fix disconnectSlaves, to try to free each slave.Oran Agra2020-06-081-1/+0
| | |/ | |/|
* | | Merge pull request #7352 from soloestoy/donot-free-protected-client-when-bloc...Salvatore Sanfilippo2020-06-081-3/+9
|\ \ \ | |/ / |/| |
| * | donot free protected client in freeClientsInAsyncFreeQueuezhaozhao.zz2020-06-021-3/+9
| |/
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-06-061-1/+1
|\ \ | |/
| * Merge pull request #7334 from kevin-fwu/tls_load_chained_certsSalvatore Sanfilippo2020-05-311-1/+1
| |\
| | * Fix TLS certificate loading for chained certificates.Kevin Fwu2020-05-271-1/+1
* | | Revert "Implements sendfile for redis."antirez2020-06-062-55/+2
* | | Revert "avoid using sendfile if tls-replication is enabled"antirez2020-06-061-34/+27
|/ /
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-291-2/+10
|\ \
| * \ Merge pull request #7330 from liuzhen/unstableSalvatore Sanfilippo2020-05-291-2/+10
| |\ \
| | * | fix clusters mixing accidentally by gossipLiu Zhen2020-05-271-2/+10
| | |/
* | | Fix handling of special chars in ACL LOAD.antirez2020-05-291-4/+8
|/ /