summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Regression test for #7249.antirez2020-05-141-0/+22
* | | | | | rax.c updated from upstream antirez/rax.antirez2020-05-141-2/+4
* | | | | | Tracking: send eviction messages when evicting entries.antirez2020-05-142-12/+29
| |/ / / / |/| | | |
* | | | | Merge pull request #7240 from oranagra/fix_replication_testSalvatore Sanfilippo2020-05-121-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix unstable replication testOran Agra2020-05-121-2/+2
|/ / / /
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-091-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #7204 from ShooterIT/benchmark-fixSalvatore Sanfilippo2020-05-081-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Redis Benchmark: Fix coredump because of double freeShooterIT2020-05-051-1/+1
| | |/ /
* | | | Cluster: clarify we always resolve the sender.antirez2020-05-091-1/+3
* | | | Cluster: refactor ping/data delay handling.antirez2020-05-091-11/+13
* | | | Cluster: introduce data_received field.antirez2020-05-092-10/+27
|/ / /
* | | stringmatchlen() should not expect null terminated strings.antirez2020-05-061-2/+2
* | | Merge pull request #7201 from braddunbar/stringmatchlenSalvatore Sanfilippo2020-05-061-2/+0
|\ \ \
| * | | Remove unreachable branch.Brad Dunbar2020-05-051-2/+0
* | | | Merge pull request #7207 from hwware/redisconffixxSalvatore Sanfilippo2020-05-061-0/+3
|\ \ \ \
| * | | | add jemalloc-bg-thread config in redis confhwware2020-05-061-0/+3
* | | | | Merge pull request #7206 from hwware/lolwutmarcofixSalvatore Sanfilippo2020-05-061-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add include guard for lolwut.hhwware2020-05-051-0/+6
|/ / / /
* | | | Merge pull request #7175 from bsergean/bsergean-patch-1Salvatore Sanfilippo2020-05-051-6/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Update redis-cli.cBenjamin Sergeant2020-05-011-6/+19
* | | | Don't propagate spurious MULTI on DEBUG LOADAOF.antirez2020-05-052-3/+6
* | | | Dump recent backlog on master query generating errors.antirez2020-05-051-0/+29
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-051-1/+1
|\ \ \ \