John Sully
|
193d7c76cb
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
|
2020-05-21 22:09:06 -04:00 |
|
John Sully
|
327d543f2c
|
Merge commit 'c5d805f87771581d3f6b29861ed2062c0ae2a688' into unstable
Former-commit-id: 95cecb0229af0278cf614ffd746ba829ae7c897c
|
2020-05-21 17:45:15 -04:00 |
|
John Sully
|
b47d7715a4
|
Merge commit '71134e357ffd6ced7c40c145205dbbac173ee181' into unstable
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
|
2020-05-21 17:32:53 -04:00 |
|
John Sully
|
5935707790
|
Merge commit '2535a172c1247d5d32d6f2fefe51b95c27ba8ae1' into unstable
Former-commit-id: 7a15f6dfc7331d6759201137971e7c2965672be8
|
2020-05-21 17:30:56 -04:00 |
|
John Sully
|
f69c169c04
|
Merge tag '6.0-rc3' into redis_6_merge
Redis 6.0 RC3.
Former-commit-id: b2cb10de5f39b4d8e1ee19877c2bdaf19eefd9db
|
2020-04-14 22:56:19 -04:00 |
|
John Sully
|
4f56e9c3b0
|
Merge commit 'e91ca9fee9c56ef319b407b104afc435be0c53cb' into redis_6_merge
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
|
2020-04-14 20:42:48 -04:00 |
|
John Sully
|
68c50ae876
|
Merge commit '6718d5d37517bd927635649708913affb98f67c9' into redis_6_merge
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
|
2020-04-14 20:19:48 -04:00 |
|
John Sully
|
2c049c16a2
|
Merge commit '79e8b17d7b44c793d8b22668b8583a297ee1b387' into redis_6_merge
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
|
2020-04-14 20:09:53 -04: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
|
397e85befb
|
Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis
Note: some tests failing
Former-commit-id: 86d7276f24f0cf1a0eceb6cd00a6a0ae2a0fa520
|
2019-05-11 02:20:34 -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
|
836e0aa80b
|
Move a bunch of files to C++
Former-commit-id: 011948bcef748df33cb18e76dc5ba48d3c5706dc
|
2019-04-07 16:54:56 -04:00 |
|