christianEQ
|
cca8d186aa
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
|
2021-02-03 18:10:27 +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
|
706ba4e1dc
|
Merge branch 'unstable' into keydbpro
Former-commit-id: b7a1e16c0f04e8aeb3764e3681fa14fc0f97f6a3
|
2020-12-10 02:37:28 +00:00 |
|
John Sully
|
e8753d1b4b
|
Blocking clients should not crash if an active replica loads a remote RDB with a key in the blocklist
Former-commit-id: 1c525e20b10e0a47af687a0d46faf75229a1cbf5
|
2020-11-19 23:28:01 +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
|
cece963cf3
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
John Sully
|
df7ac419d0
|
Merge commit '3a441c7d95c8757d2ab12ff730cc7ca8899538c9' into unstable
Former-commit-id: c52e1fc78c369843e49a22765bed2c53e99d9709
|
2020-05-22 15:42:50 -04:00 |
|
John Sully
|
27eb239f1a
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
|
2020-05-21 22:09:06 -04:00 |
|
John Sully
|
48058188a8
|
Merge commit '414debfd04d21c0b19d5f6bb5249398d83670f3d' into unstable
Former-commit-id: 201bf73ef772914c56ac680bb9c7fb6a98b218b2
|
2020-05-21 18:57:28 -04:00 |
|
John Sully
|
05cc1fd3de
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
68fd7c5c3d
|
Merge commit 'c3b268a0bcded2d730790a772176483efb7c31fb' into redis_6_merge
Former-commit-id: 50768cd242c0360c6e943c57f866789280d30dc0
|
2020-04-14 22:25:44 -04:00 |
|
John Sully
|
02147b4be0
|
Merge commit '0f7dfc378ce5ab0524ac28b6142545bc41435386' into redis_6_merge
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
|
2020-04-14 22:19:29 -04:00 |
|
John Sully
|
14cf73deaa
|
Merge KeyDB 6
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
|
2020-01-29 12:55:23 -05:00 |
|
John Sully
|
e3b2ef962b
|
reenable multithreading after merge
Former-commit-id: 9fbb9a551e83ddfc66894fba688dae7c9c3c7ae1
|
2020-01-27 19:59:04 -05: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
|
fbc7821244
|
Fix crash when client running async keys disconnects before keys finishes
Former-commit-id: dd9233c49d82c89a9d92b7251a56f91c2ee98e77
|
2019-11-21 20:40:58 -05:00 |
|
John Sully
|
036fc9614d
|
Run KEYS async
Former-commit-id: 214a54a815ff66ef4a1526da90296787240ecdf9
|
2019-11-19 22:12:52 -05:00 |
|
John Sully
|
c61b6cc8fd
|
Update more slave instances to use replica (Issue #75)
Former-commit-id: 252725d50fc9d4ff2b6e9246a36c38176d61beae
|
2019-10-13 12:29:20 -04:00 |
|
John Sully
|
a9500e5483
|
Blocked clients can stall when under low load
Former-commit-id: 7468c691ad04829c1fd3ae69f206946e8f38254a
|
2019-07-13 16:44:11 -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
|
e2e3acf04c
|
Factor out some normally const globals
Former-commit-id: fa2e407873fce7f936943ae1fe162d54d7bedd70
|
2019-04-21 13:20:45 -04:00 |
|
John Sully
|
83a7f2f2bd
|
Move a bunch of files to C++
Former-commit-id: 011948bcef748df33cb18e76dc5ba48d3c5706dc
|
2019-04-07 16:54:56 -04:00 |
|