 John Sully
|
da2aceabcf
|
Merge tag '6.2.3' into unstable
Former-commit-id: 1895dbb768
|
2021-07-09 04:40:31 +00:00 |
|
|
John Sully
|
5267928381
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17
|
2021-05-21 05:54:39 +00:00 |
|
|
John Sully
|
fe8efa916b
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0
|
2021-05-19 02:59:48 +00:00 |
|
 christianEQ
|
358debebfa
|
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: dadce055f8
|
2021-01-26 21:43:09 +00:00 |
|
|
John Sully
|
3384af024d
|
Merge commit 'cbcd07777dc569618a34f59e5fd0de53178f4f1d' into unstable
Former-commit-id: 49784c8122
|
2020-05-21 18:48:49 -04:00 |
|
|
John Sully
|
b6500a08dc
|
Merge commit '026cc11b056f063631d990f1a9db45b4e583974e' into unstable
Former-commit-id: 95cecb0229
|
2020-05-21 17:45:15 -04:00 |
|
|
John Sully
|
5dbcd55669
|
Merge commit '51c1a9f8fbc12a9276489178242e498bb6ccbdba' into redis_6_merge
Former-commit-id: 09e8fb17cd
|
2020-04-14 18:44:42 -04:00 |
|
|
John Sully
|
39378f982e
|
Fix most tests (still some failures)
Former-commit-id: da83e84125
|
2020-01-27 18:16:19 -05:00 |
|
|
John Sully
|
8e5fe97525
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf
|
2020-01-27 02:55:48 -05:00 |
|
|
John Sully
|
c61b6cc8fd
|
Update more slave instances to use replica (Issue #75)
Former-commit-id: 252725d50f
|
2019-10-13 12:29:20 -04:00 |
|
|
John Sully
|
27cb5dba75
|
New expire datastructure and algorithm. Allows us to expire in sublinear time
Former-commit-id: 3880d2616c
|
2019-07-23 18:30:10 -04:00 |
|
|
John Sully
|
8f1e7d9d5b
|
Fix deadlock with client and ae locks
Former-commit-id: 8630339e43
|
2019-07-12 20:46:50 -04:00 |
|
|
John Sully
|
7b87123505
|
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: 37b2d046be
|
2019-04-21 14:01:10 -04:00 |
|
|
John Sully
|
e2e3acf04c
|
Factor out some normally const globals
Former-commit-id: fa2e407873
|
2019-04-21 13:20:45 -04:00 |
|
|
John Sully
|
b5e25f876f
|
Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2
|
2019-04-16 23:16:03 -04:00 |
|
|
John Sully
|
a7ed7e06a8
|
Merge branch 'unstable' into wip-multimaster
Former-commit-id: 4326d22380
|
2019-04-03 00:12:13 -04:00 |
|
|
John Sully
|
c40779752e
|
Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: 3745bbd95b
|
2019-04-03 00:00:38 -04:00 |
|
|
John Sully
|
9b87144950
|
It compiles and doesn't crash immediately!
Former-commit-id: efaeca5887
|
2019-04-02 16:47:05 -04:00 |
|
|
John Sully
|
02b030bc8c
|
Module threading fixes
Former-commit-id: 2785a8b4d4
|
2019-03-07 19:13:01 -05:00 |
|
|
John Sully
|
f4b060e0bd
|
Prevent mixed up client replies, and deadlocks
|
2019-02-22 01:24:16 -05:00 |
|
|
John Sully
|
d016b967c5
|
Implement try_lock
|
2019-02-22 01:23:31 -05:00 |
|