summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* LPOS: tests + crash fix.lposantirez2020-06-112-1/+45
* LPOS: update to latest proposal.antirez2020-06-111-40/+59
* LPOS: implement the final design.antirez2020-06-103-22/+85
* LRANK: Add command (the command will be renamed LPOS).Paul Spooren2020-06-104-0/+44
* Adapt EVAL+busy script test to new behavior.antirez2020-06-091-0/+3
* Temporary fix for #7353 issue about EVAL during -BUSY.antirez2020-06-091-0/+9
* Merge pull request #7363 from xhebox/unstableSalvatore Sanfilippo2020-06-081-1/+1
|\
| * return the correct proto versionxhe2020-06-071-1/+1
* | Merge pull request #7370 from oranagra/no_queue_in_aborted_multiSalvatore Sanfilippo2020-06-081-0/+7
|\ \
| * | Don't queue commands in an already aborted MULTI stateOran Agra2020-06-081-0/+7
| |/
* | Merge pull request #7369 from oranagra/no_reject_watchSalvatore Sanfilippo2020-06-081-2/+4
|\ \
| * | Avoid rejecting WATCH / UNWATCH, like MULTI/EXEC/DISCARDOran Agra2020-06-081-2/+4
| |/
* | Merge pull request #7357 from soloestoy/bugfix-aof-keepttlSalvatore Sanfilippo2020-06-082-8/+23
|\ \
| * | AOF: append origin SET if no expire optionzhaozhao.zz2020-06-032-8/+23
* | | Merge pull request #7371 from oranagra/fix_disconnectSlavesSalvatore Sanfilippo2020-06-081-1/+0
|\ \ \
| * | | fix disconnectSlaves, to try to free each slave.Oran Agra2020-06-081-1/+0
| | |/ | |/|
* | | Merge pull request #7352 from soloestoy/donot-free-protected-client-when-bloc...Salvatore Sanfilippo2020-06-081-3/+9
|\ \ \ | |/ / |/| |
| * | donot free protected client in freeClientsInAsyncFreeQueuezhaozhao.zz2020-06-021-3/+9
| |/
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-06-062-1/+2
|\ \ | |/
| * Merge pull request #7349 from oranagra/pingoff-test-raceSalvatore Sanfilippo2020-05-311-0/+1
| |\
| | * fix pingoff test raceOran Agra2020-05-311-0/+1
| |/
| * Merge pull request #7334 from kevin-fwu/tls_load_chained_certsSalvatore Sanfilippo2020-05-311-1/+1
| |\
| | * Fix TLS certificate loading for chained certificates.Kevin Fwu2020-05-271-1/+1
* | | Revert "Implements sendfile for redis."antirez2020-06-062-55/+2
* | | Revert "avoid using sendfile if tls-replication is enabled"antirez2020-06-061-34/+27
|/ /
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-291-2/+10
|\ \
| * \ Merge pull request #7330 from liuzhen/unstableSalvatore Sanfilippo2020-05-291-2/+10
| |\ \
| | * | fix clusters mixing accidentally by gossipLiu Zhen2020-05-271-2/+10
| | |/
* | | Fix handling of special chars in ACL LOAD.antirez2020-05-291-4/+8
* | | Test: take PSYNC2 test master timeout high during switch.antirez2020-05-281-1/+0
|/ /
* | Test: add the tracking unit as default.antirez2020-05-281-0/+1
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-05-288-33/+287
|\ \
| * \ Merge pull request #7327 from oranagra/test-port-rangesSalvatore Sanfilippo2020-05-285-31/+48
| |\ \
| | * | tests: find_available_port start search from next portOran Agra2020-05-271-7/+12
| | * | tests: each test client work on a distinct port rangeOran Agra2020-05-265-27/+39
| * | | Merge pull request #7336 from oranagra/modules_ci_32bitSalvatore Sanfilippo2020-05-282-2/+7
| |\ \ \
| | * | | 32bit CI needs to build modules correctlyOran Agra2020-05-272-2/+7
| | | |/ | | |/|
| * | | Merge pull request #7339 from oranagra/revive_mo_testsSalvatore Sanfilippo2020-05-282-0/+232
| |\ \ \
| | * | | adjust revived meaningful offset testsOran Agra2020-05-281-20/+39
| | * | | revive meaningful offset testsOran Agra2020-05-282-0/+213
| |/ / /
* | | | Replication: showLatestBacklog() refactored out.antirez2020-05-283-25/+36
|/ / /
* | | 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
| | |/