John Sully
|
ea6a0f214b
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
|
2021-05-21 05:54:39 +00:00 |
|
John Sully
|
f49d8f9adb
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
|
2021-05-19 02:59:48 +00:00 |
|
christianEQ
|
c068f2cd3d
|
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
|
2021-01-26 21:43:09 +00:00 |
|
John Sully
|
ccedb2fa73
|
Merge commit 'd7b07d3ded06b4cd843baffd3a6d33dd96efd401' into unstable
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
|
2020-05-21 18:48:49 -04:00 |
|
John Sully
|
327d543f2c
|
Merge commit 'c5d805f87771581d3f6b29861ed2062c0ae2a688' into unstable
Former-commit-id: 95cecb0229af0278cf614ffd746ba829ae7c897c
|
2020-05-21 17:45:15 -04:00 |
|
John Sully
|
2038fa270a
|
Merge commit '491949ee5bf4ffbfc746ea4ed5a6d673b0e2fb81' into redis_6_merge
Former-commit-id: 09e8fb17cd0889ad17461e48446221b3955f5a8f
|
2020-04-14 18:44:42 -04:00 |
|
John Sully
|
14188ef92d
|
Fix most tests (still some failures)
Former-commit-id: da83e841255487efe0e4b13d42b2dcc55a369838
|
2020-01-27 18:16:19 -05:00 |
|
John Sully
|
6193e9ad4f
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf94326bf2f163db7698aad9a3c01690
|
2020-01-27 02:55:48 -05:00 |
|
John Sully
|
e57d2e24c9
|
Update more slave instances to use replica (Issue #75)
Former-commit-id: 252725d50fc9d4ff2b6e9246a36c38176d61beae
|
2019-10-13 12:29:20 -04:00 |
|
John Sully
|
a060bc7942
|
New expire datastructure and algorithm. Allows us to expire in sublinear time
Former-commit-id: 3880d2616c882e19169180dc10268564347b0279
|
2019-07-23 18:30:10 -04:00 |
|
John Sully
|
8cd37fae2c
|
Fix deadlock with client and ae locks
Former-commit-id: 8630339e43c1de1cd723bdfdca8ab5924e2cb8b0
|
2019-07-12 20:46:50 -04:00 |
|
John Sully
|
6ae796cb91
|
refactor server global into a pointer (so that threadsafe commands can set this to NULL to prove they don't rely on it
Former-commit-id: 37b2d046bef12c7ee7cac4883f0b64ddde236d74
|
2019-04-21 14:01:10 -04:00 |
|
John Sully
|
83adc0eabb
|
Factor out some normally const globals
Former-commit-id: fa2e407873fce7f936943ae1fe162d54d7bedd70
|
2019-04-21 13:20:45 -04:00 |
|
John Sully
|
0e10e4f6f5
|
Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2a7d8ca5034f2fbe8b71550f290ea64
|
2019-04-16 23:16:03 -04:00 |
|
John Sully
|
846cad0637
|
Merge branch 'unstable' into wip-multimaster
Former-commit-id: 4326d22380e4e4d9491c4b7cd050b26ec49663b3
|
2019-04-03 00:12:13 -04:00 |
|
John Sully
|
22c8d9f70b
|
Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: 3745bbd95b16d7134c86143f458d7f31168c7d33
|
2019-04-03 00:00:38 -04:00 |
|
John Sully
|
5d3c28a902
|
It compiles and doesn't crash immediately!
Former-commit-id: efaeca588717ca7cd44aa3502672d158acd94a6d
|
2019-04-02 16:47:05 -04:00 |
|
John Sully
|
25c2050c3a
|
Module threading fixes
Former-commit-id: 2785a8b4d40b09caea5e209ab49fc5f1484981a8
|
2019-03-07 19:13:01 -05:00 |
|
John Sully
|
30e8a859c0
|
Prevent mixed up client replies, and deadlocks
|
2019-02-22 01:24:16 -05:00 |
|
John Sully
|
2788cf57b0
|
Implement try_lock
|
2019-02-22 01:23:31 -05:00 |
|