summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* PSYNC2: meaningful offset test.meaningful-offsetantirez2020-03-252-0/+62
* PSYNC2: meaningful offset implemented.antirez2020-03-253-1/+40
* Explain why we allow transactions in -BUSY state.antirez2020-03-251-2/+9
* Merge pull request #7022 from oranagra/multi-busy-scriptSalvatore Sanfilippo2020-03-252-0/+73
|\
| * MULTI/EXEC during LUA script timeout are messed upOran Agra2020-03-232-0/+73
|/
* Improve comments of replicationCacheMasterUsingMyself().antirez2020-03-231-1/+6
* Fix BITFIELD_RO test.antirez2020-03-232-5/+5
* Abort transactions after -READONLY error. Fix #7014.antirez2020-03-231-0/+1
* Minor changes to BITFIELD_RO PR #6951.antirez2020-03-231-6/+9
* Merge pull request #6951 from yangbodong22011/feature-bitfield-roSalvatore Sanfilippo2020-03-234-1/+54
|\
| * Added BITFIELD_RO variants for read-only operations.bodong.ybd2020-03-044-1/+54
* | Modules: updated function doc after #7003.antirez2020-03-231-1/+6
* | Merge pull request #7003 from guybe7/rm_context_flags_handle_nullSalvatore Sanfilippo2020-03-231-14/+16
|\ \
| * | Allow RM_GetContextFlags to work with ctx==NULLGuy Benoish2020-03-181-14/+16
| |/
* | Merge pull request #7005 from hwware/memoryleakfix-redis-cliSalvatore Sanfilippo2020-03-231-0/+2
|\ \
| * | fix potentical memory leak in redis-clihwware2020-03-181-0/+2
* | | Merge pull request #7018 from yossigo/fix-accept-issuesSalvatore Sanfilippo2020-03-235-40/+58
|\ \ \
| * | | Fix crashes related to failed/rejected accepts.Yossi Gottlieb2020-03-221-5/+6
| * | | Cluster: fix misleading accept errors.Yossi Gottlieb2020-03-221-3/+4
| * | | Conns: Fix connClose() / connAccept() behavior.Yossi Gottlieb2020-03-223-32/+48
* | | | Merge pull request #7019 from hwware/cscfixSalvatore Sanfilippo2020-03-231-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | remove redundant Semicolonhwware2020-03-231-1/+1
| * | | clean CLIENT_TRACKING_CACHING flag when disabled cachinghwware2020-03-231-1/+1
* | | | Merge pull request #7013 from hwware/clusterhelpfixSalvatore Sanfilippo2020-03-201-1/+2
|\ \ \ \
| * | | | add missing commands in cluster helphwware2020-03-201-1/+2
| |/ / /
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-03-206-4/+102
|\ \ \ \ | |/ / /
| * | | Merge pull request #6996 from artix75/redis_cli_proxy_infoSalvatore Sanfilippo2020-03-181-1/+5
| |\ \ \
| | * | | Support Redis Cluster Proxy PROXY INFO commandartix2020-03-161-1/+5
| * | | | Merge pull request #7000 from ppillip/patch-1Salvatore Sanfilippo2020-03-181-1/+1
| |\ \ \ \
| | * | | | Update redis.conf박승현2020-03-181-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #7001 from trevor211/fixDataInconsistencySalvatore Sanfilippo2020-03-184-2/+96
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix master replica inconsistency for upgrading scenario.WuYunlong2020-03-183-2/+9
| | * | | Add 14-consistency-check.tcl to prove there is a data consistency issue.WuYunlong2020-03-181-0/+87
| |/ / /
* | | | Regression test for #7011.antirez2020-03-201-0/+7
* | | | ACL: default user off should not allow automatic authentication.antirez2020-03-202-2/+3
|/ / /
* | | Sentinel: document auth-user directive.antirez2020-03-161-0/+12
* | | ACL: Make Redis 6 more backward compatible with requirepass.antirez2020-03-164-15/+17
* | | Sentinel: implement auth-user directive for ACLs.antirez2020-03-161-7/+38
|/ /
* | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2020-03-162-6/+14
|\ \
| * \ Merge pull request #6991 from soloestoy/io-threads-bugfixSalvatore Sanfilippo2020-03-161-5/+11
| |\ \
| | * | Threaded IO: bugfix client kill may crash rediszhaozhao.zz2020-03-151-5/+11
| * | | Merge pull request #6993 from soloestoy/optimize-threaded-ioSalvatore Sanfilippo2020-03-161-1/+3
| |\ \ \
| | * | | Threaded IO: handle pending reads clients ASAP after event loopzhaozhao.zz2020-03-161-1/+3
* | | | | Example sentinel conf: document requirepass.antirez2020-03-161-0/+8
|/ / / /
* | | | Aesthetic changes in PR #6989.antirez2020-03-151-5/+9
* | | | Merge pull request #6989 from soloestoy/io-threads-bugfixSalvatore Sanfilippo2020-03-151-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Threaded IO: bugfix #6988 process events while blockedzhaozhao.zz2020-03-151-0/+5
|/ /
* | Restore newline at the end of redis-cli.cantirez2020-03-131-1/+2
* | Merge pull request #6918 from chendq8/fixModuleUnregisterUsedApiSalvatore Sanfilippo2020-03-131-1/+1
|\ \
| * | use correct list for moduleUnregisterUsedAPIchendianqiang2020-02-221-1/+1