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
|
b6500a08dc
|
Merge commit '026cc11b056f063631d990f1a9db45b4e583974e' into unstable
Former-commit-id: 95cecb0229af0278cf614ffd746ba829ae7c897c
|
2020-05-21 17:45:15 -04:00 |
|
John Sully
|
24322b9b6d
|
Merge commit 'eba28e2cea0b2632cf751426ada02adf24f273db' into unstable
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
|
2020-05-21 17:32:53 -04:00 |
|
John Sully
|
ba7483c20b
|
Merge commit 'c35a53169ffdbdf73f91224b6e62f6129fb9a838' into unstable
Former-commit-id: 7a15f6dfc7331d6759201137971e7c2965672be8
|
2020-05-21 17:30:56 -04:00 |
|
John Sully
|
d3ebe3b6bd
|
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
|
07005cc187
|
Merge commit 'be4bc1a5be26a7fde2fd05acd8187f5f0ed59f25' into redis_6_merge
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
|
2020-04-14 20:42:48 -04:00 |
|
John Sully
|
f27524674a
|
Merge commit '973297336fc05a601e17be70aba88e5dca6480ae' into redis_6_merge
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
|
2020-04-14 20:19:48 -04:00 |
|
John Sully
|
d57fa7c8f9
|
Merge commit '349aa24511253b3e323064b95cefb4414f31726c' into redis_6_merge
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
|
2020-04-14 20:09:53 -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
|
c61b6cc8fd
|
Update more slave instances to use replica (Issue #75)
Former-commit-id: 252725d50fc9d4ff2b6e9246a36c38176d61beae
|
2019-10-13 12:29:20 -04:00 |
|
John Sully
|
e48c132d35
|
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
|
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
|
b5e25f876f
|
Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2a7d8ca5034f2fbe8b71550f290ea64
|
2019-04-16 23:16:03 -04:00 |
|
John Sully
|
83a7f2f2bd
|
Move a bunch of files to C++
Former-commit-id: 011948bcef748df33cb18e76dc5ba48d3c5706dc
|
2019-04-07 16:54:56 -04:00 |
|