 VivekSainiEQ
|
93b0482376
|
Resolved merge conflicts in prior commit
Former-commit-id: b88f06b16f
|
2021-10-21 22:35:15 +00:00 |
|
|
VivekSainiEQ
|
1d882b5ddd
|
Merge tag '6.2.6' into Redis_626_Merge
Former-commit-id: e6d7e01be6
|
2021-10-21 22:33:55 +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
|
b336d269ca
|
Remove addReply*Async methods since we already know if its async or not. This is just a source of bugs
Former-commit-id: df22cdf6e9
|
2020-10-24 02:18:03 +00:00 |
|
|
John Sully
|
4f18a247e3
|
Merge tag '6.0.8' into unstable
Former-commit-id: 4c7e4b91a6
|
2020-09-30 19:47:55 +00:00 |
|
|
John Sully
|
54de1d579d
|
Fix protocol difference with Redis
Former-commit-id: dec5db4e71
|
2020-09-11 20:08:26 +00:00 |
|
|
John Sully
|
27eb239f1a
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c3
|
2020-05-21 22:09:06 -04: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
|
a7afb4c3f7
|
Fix regressions from RESP3 changes in commit 317f8b9d38
Former-commit-id: c5cbb77fc7
|
2019-05-20 23:39:44 -04:00 |
|
|
John Sully
|
e48c132d35
|
Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis
Note: some tests failing
Former-commit-id: 86d7276f24
|
2019-05-11 02:20:34 -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
|
9e714b477f
|
Fix addition RESP3 regressions (return empty set)
Former-commit-id: 740fc6c2b8
|
2019-04-08 16:52:57 -04:00 |
|
|
John Sully
|
83a7f2f2bd
|
Move a bunch of files to C++
Former-commit-id: 011948bcef
|
2019-04-07 16:54:56 -04:00 |
|