VivekSainiEQ
|
93b0482376
|
Resolved merge conflicts in prior commit
Former-commit-id: b88f06b16f3d9e58ec884c61d2d074d7a489775e
|
2021-10-21 22:35:15 +00:00 |
|
VivekSainiEQ
|
1d882b5ddd
|
Merge tag '6.2.6' into Redis_626_Merge
Former-commit-id: e6d7e01be6965110d487e12f40511fe0b3497695
|
2021-10-21 22:33:55 +00:00 |
|
John Sully
|
5267928381
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
|
2021-05-21 05:54:39 +00:00 |
|
John Sully
|
fe8efa916b
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
|
2021-05-19 02:59:48 +00:00 |
|
christianEQ
|
358debebfa
|
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
|
b336d269ca
|
Remove addReply*Async methods since we already know if its async or not. This is just a source of bugs
Former-commit-id: df22cdf6e91a1b9c390b69c4209c719ecf1e44f1
|
2020-10-24 02:18:03 +00:00 |
|
John Sully
|
27eb239f1a
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
|
2020-05-21 22:09:06 -04:00 |
|
John Sully
|
8e5fe97525
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf94326bf2f163db7698aad9a3c01690
|
2020-01-27 02:55:48 -05:00 |
|
John Sully
|
452ace5b95
|
Another RESP3 regression
Former-commit-id: 4e30a5b4e53a4d1580f8d7cca8a8eac11e36ce4d
|
2019-07-17 22:57:52 -04:00 |
|
John Sully
|
2a1d7890f6
|
Fix compile errors on GCC v5
Former-commit-id: 1f08a0efb33511ddc75c2acc62199bfcd0860137
|
2019-07-11 20:20:01 -04:00 |
|
John Sully
|
a7afb4c3f7
|
Fix regressions from RESP3 changes in commit 317f8b9d383f1b7f171aef7ea29f9e05abf0ba83
Former-commit-id: c5cbb77fc7e3b2b5124b9432e144d8c74190c755
|
2019-05-20 23:39:44 -04:00 |
|
John Sully
|
e9b8d4e73a
|
Protocol regression from RESP3 work
Former-commit-id: 8c56dbf971aced9e18d170dfffb0c074b545f718
|
2019-05-20 10:57:37 -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: 37b2d046bef12c7ee7cac4883f0b64ddde236d74
|
2019-04-21 14:01:10 -04:00 |
|
John Sully
|
b5e25f876f
|
Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2a7d8ca5034f2fbe8b71550f290ea64
|
2019-04-16 23:16:03 -04:00 |
|
John Sully
|
9e714b477f
|
Fix addition RESP3 regressions (return empty set)
Former-commit-id: 740fc6c2b865f3846fc7c2b53e5b8303020964f2
|
2019-04-08 16:52:57 -04:00 |
|
John Sully
|
83a7f2f2bd
|
Move a bunch of files to C++
Former-commit-id: 011948bcef748df33cb18e76dc5ba48d3c5706dc
|
2019-04-07 16:54:56 -04:00 |
|