summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Revert "Keep track of meaningful replication offset in replicas too"antirez2020-05-274-87/+74
* Revert "Disconnect chained replicas when the replica performs PSYNC with the ...antirez2020-05-271-10/+3
* Revert "Fix #7306 less aggressively."antirez2020-05-272-29/+17
* Revert "Make disconnectSlaves() synchronous in the base case."antirez2020-05-273-20/+9
* Revert "PSYNC2: second_replid_offset should be real meaningful offset"zhaozhao.zz2020-05-271-3/+3
* Revert "Clarify what is happening in PR #7320."antirez2020-05-271-5/+1
* Set a protocol error if master use the inline protocol.antirez2020-05-271-2/+17
* Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-261-27/+34
|\
| * Merge pull request #7328 from oranagra/daily_tls_testSalvatore Sanfilippo2020-05-261-27/+34
| |\
| | * avoid using sendfile if tls-replication is enabledOran Agra2020-05-261-27/+34
* | | Replication: log backlog creation event.antirez2020-05-261-0/+3
|/ /
* | Clarify what is happening in PR #7320.antirez2020-05-251-1/+5
* | PSYNC2: second_replid_offset should be real meaningful offsetzhaozhao.zz2020-05-251-3/+3
|/
* Make disconnectSlaves() synchronous in the base case.antirez2020-05-223-9/+20
* Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-222-2/+55
|\
| * Merge pull request #7096 from ShooterIT/sendfileSalvatore Sanfilippo2020-05-222-2/+55
| |\
| | * Implements sendfile for redis.ShooterIT2020-04-142-2/+55
* | | Fix #7306 less aggressively.antirez2020-05-222-17/+29
|/ /
* | Merge pull request #7305 from madolson/unstable-connectionSalvatore Sanfilippo2020-05-221-0/+4
|\ \
| * | EAGAIN for tls during diskless loadMadelyn Olson2020-05-211-0/+4
* | | Disconnect chained replicas when the replica performs PSYNC with the master a...Qu Chen2020-05-211-3/+10
* | | using moreargs variablehwware2020-05-211-2/+2
* | | fix server crash for STRALGO commandhwware2020-05-211-2/+2
|/ /
* | Merge pull request #7300 from ShooterIT/commentSalvatore Sanfilippo2020-05-211-2/+2
|\ \
| * | Replace addDeferredMultiBulkLength with addReplyDeferredLen in commentShooterIT2020-05-211-2/+2
* | | Merge pull request #7299 from ShooterIT/reply-bytesSalvatore Sanfilippo2020-05-211-1/+1
|\ \ \
| * | | Fix reply bytes calculation errorShooterIT2020-05-211-1/+1
| |/ /
* | | Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir brokenzhaozhao.zz2020-05-211-0/+1
|/ /
* | fix a rare active defrag edge case bug leading to stagnationOran Agra2020-05-201-10/+3
* | improve DEBUG MALLCTL to be able to write to write only fields.Oran Agra2020-05-201-7/+27
* | Merge pull request #7276 from hujiecs/fix-clear-all-command-flag-in-aclSalvatore Sanfilippo2020-05-191-4/+5
|\ \
| * | fix clear USER_FLAG_ALLCOMMANDS flag in aclhujie2020-05-191-4/+5
* | | Merge pull request #7196 from ShooterIT/benchmarkSalvatore Sanfilippo2020-05-191-1/+12
|\ \ \
| * | | Redis Benchmark: generate random test dataShooterIT2020-05-181-1/+12
* | | | Redis-Benchmark: avoid potentical memmory leakinghwware2020-05-181-1/+1
| |/ / |/| |
* | | Merge pull request #7252 from ShooterIT/dictsizeSalvatore Sanfilippo2020-05-181-2/+2
|\ \ \
| * | | Use dictSize to get the size of dict in dict.cShooterIT2020-05-071-2/+2
* | | | Merge pull request #7255 from madolson/dev-unstable-converge-hash-validationSalvatore Sanfilippo2020-05-181-14/+21
|\ \ \ \
| * | | | Converge hash validation for adding and removingMadelyn Olson2020-05-141-14/+21
* | | | | Merge pull request #7247 from bsergean/patch-3Salvatore Sanfilippo2020-05-181-5/+18
|\ \ \ \ \
| * | | | | do not handle --cluster-yes for cluster fix modeBenjamin Sergeant2020-05-141-7/+16
| * | | | | fix typo ...Benjamin Sergeant2020-05-131-1/+1
| * | | | | Redis-cli 6.0.1 `--cluster-yes` doesn't work (fix #7246)Benjamin Sergeant2020-05-131-1/+5
* | | | | | Remove the client from CLOSE_ASAP list before caching the master.antirez2020-05-162-12/+12
* | | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-156-1/+87
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7230 from yossigo/tls-crypto-locksSalvatore Sanfilippo2020-05-141-0/+45
| |\ \ \ \ \ \
| | * | | | | | TLS: Add crypto locks for older OpenSSL support.Yossi Gottlieb2020-05-101-0/+45
| | |/ / / / /
| * | | | | | Merge pull request #7244 from devnexen/netbsd_build_fixSalvatore Sanfilippo2020-05-143-1/+30
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | NetBSD build update.David Carlier2020-05-123-1/+30
| | |/ / / /
| * | | | | Added a refcount on timer events to prevent deletion of recursive timer callsMadelyn Olson2020-05-142-0/+12