summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve the PSYNC2 test reliability.psync2-test-improvementantirez2020-05-161-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
|\ \ \
| * \ \ Merge pull request #7200 from titouanc/fix-redis6-uclibcSalvatore Sanfilippo2020-05-051-1/+1
| |\ \ \
| | * | | make struct user anonymous (only typedefed)Titouan Christophe2020-05-051-1/+1
| |/ / /
* | | | Test: --dont-clean should do first cleanup.antirez2020-05-051-5/+2
|/ / /
* | | Merge pull request #7197 from bsergean/patch-1Salvatore Sanfilippo2020-05-051-2/+15
|\ \ \
| * | | Add --user argument to redis-benchmark.c (ACL)Benjamin Sergeant2020-05-041-2/+15
| | |/ | |/|
* | | Drop not needed part from #7194.antirez2020-05-051-1/+1
* | | Merge pull request #7194 from tryfinally/dev-reverse-bitsSalvatore Sanfilippo2020-05-051-3/+3
|\ \ \
| * | | Fix compiler warnings on function rev(unsigned long)Muhammad Zahalqa2020-05-041-3/+3
| |/ /
* | | Move CRC64 initialization in main().antirez2020-05-052-4/+1
* | | Fix CRC64 initialization outside the Redis server itself.antirez2020-05-051-0/+3
|/ /
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-043-0/+8
|\ \