summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Drop useless line from replicationCacheMaster().no-mo-firstantirez2020-05-271-2/+0
* Another meaningful offset test removed.antirez2020-05-271-100/+0
* Remove the PSYNC2 meaningful offset test.antirez2020-05-272-113/+0
* Remove the meaningful offset feature.antirez2020-05-274-93/+10
* 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-262-27/+49
|\
| * Merge pull request #7328 from oranagra/daily_tls_testSalvatore Sanfilippo2020-05-262-27/+49
| |\
| | * daily CI test with tlsOran Agra2020-05-261-0/+15
| | * avoid using sendfile if tls-replication is enabledOran Agra2020-05-261-27/+34
* | | Replication: log backlog creation event.antirez2020-05-261-0/+3
|/ /
* | Test: PSYNC2 test can now show server logs.antirez2020-05-251-25/+88
* | Clarify what is happening in PR #7320.antirez2020-05-251-1/+5
* | Merge pull request #7320 from soloestoy/second-replid-offset-should-be-meanin...Salvatore Sanfilippo2020-05-251-3/+3
|\ \ | |/ |/|
| * PSYNC2: second_replid_offset should be real meaningful offsetzhaozhao.zz2020-05-251-3/+3
|/
* Merge pull request #7315 from oranagra/ci-32bitSalvatore Sanfilippo2020-05-242-0/+34
|\
| * add CI for 32bit buildOran Agra2020-05-242-0/+34
|/
* 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
* | | Merge pull request #7306 from QuChen88/chained-replica-offsetSalvatore Sanfilippo2020-05-222-3/+60
|\ \ \
| * | | Disconnect chained replicas when the replica performs PSYNC with the master a...Qu Chen2020-05-212-3/+60
|/ / /
* | | Merge pull request #7304 from hwware/lcs_fixSalvatore Sanfilippo2020-05-221-2/+2
|\ \ \ | |/ / |/| |
| * | 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 #7288 from yossigo/tls-protocols-redis-conf-exampleSalvatore Sanfilippo2020-05-211-2/+3
|\ \ \
| * | | TLS: Improve tls-protocols clarity in redis.conf.Yossi Gottlieb2020-05-201-2/+3
* | | | Merge pull request #7299 from ShooterIT/reply-bytesSalvatore Sanfilippo2020-05-211-1/+1
|\ \ \ \
| * | | | Fix reply bytes calculation errorShooterIT2020-05-211-1/+1
| | |/ / | |/| |
* | | | Merge pull request #7296 from soloestoy/tracking-broken-redirSalvatore Sanfilippo2020-05-211-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Tracking: flag CLIENT_TRACKING_BROKEN_REDIR when redir brokenzhaozhao.zz2020-05-211-0/+1
|/ / /
* | | Merge pull request #7289 from oranagra/defrag_edge_caseSalvatore Sanfilippo2020-05-205-30/+173
|\ \ \ | |/ / |/| |
| * | fix a rare active defrag edge case bug leading to stagnationOran Agra2020-05-204-23/+146
| * | 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
* | | | Merge pull request #7279 from hwware/benchmark_leak_fixSalvatore Sanfilippo2020-05-191-1/+1
|\ \ \ \
| * | | | Redis-Benchmark: avoid potentical memmory leakinghwware2020-05-181-1/+1
| | |/ / | |/| |
* | | | Merge pull request #7232 from trevor211/handleHashTagWhenComputingHashSlotSalvatore Sanfilippo2020-05-192-3/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Handle keys with hash tag when computing hash slot using tcl cluster client.WuYunlong2020-05-111-2/+23
| * | | Add a test to prove current tcl cluster client can not handle keys with hash ...WuYunlong2020-05-111-1/+7
* | | | 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