summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* EAGAIN for tls during diskless loadMadelyn Olson2020-05-211-0/+4
* 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
* | | | 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
* | | | | | Merge pull request #7271 from oranagra/fix_valgrind_repl_testSalvatore Sanfilippo2020-05-181-1/+1
|\ \ \ \ \ \
| * | | | | | fix valgrind test failure in replication testOran Agra2020-05-181-1/+1
|/ / / / / /
* | | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-171-0/+52
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7264 from oranagra/test_for_7205Salvatore Sanfilippo2020-05-171-0/+52
| |\ \ \ \ \ \
| | * | | | | | add regression test for the race in #7205Oran Agra2020-05-171-0/+52
| |/ / / / / /
* | | | | | | Improve the PSYNC2 test reliability.antirez2020-05-171-15/+33
|/ / / / / /
* | | | | | 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-157-21/+87
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7229 from yossigo/tls-fails-on-recent-debianSalvatore Sanfilippo2020-05-141-20/+0
| |\ \ \ \ \ \
| | * | | | | | TLS: Fix test failures on recent Debian/Ubuntu.Yossi Gottlieb2020-05-101-20/+0
| | | |_|_|/ / | | |/| | | |
| * | | | | | 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
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #7253 from madolson/unstable-ae-recursionSalvatore Sanfilippo2020-05-142-0/+12
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Added a refcount on timer events to prevent deletion of recursive timer callsMadelyn Olson2020-05-142-0/+12
| |/ / / / /
* | | | | | Cache master without checking of deferred close flags.antirez2020-05-153-8/+11
|/ / / / /
* | | | | Merge branch 'free_clients_during_loading' into unstableantirez2020-05-148-24/+126
|\ \ \ \ \
| * | | | | Track events processed while blocked globally.free_clients_during_loadingantirez2020-05-145-17/+32
| * | | | | Some rework of #7234.antirez2020-05-124-65/+77
| * | | | | fix redis 6.0 not freeing closed connections during loading.Oran Agra2020-05-113-58/+133
| | |/ / / | |/| | |