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
|
4f18a247e3
|
Merge tag '6.0.8' into unstable
Former-commit-id: 4c7e4b91a6bb2034636856b608b8c386d07f5541
|
2020-09-30 19:47:55 +00:00 |
|
John Sully
|
1ad2d96697
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 0dafbc254a0efd5ee302d5c58fb2ca0a85110104
|
2020-07-13 03:31:47 +00:00 |
|
John Sully
|
d4dd336834
|
Merge tag '6.0.5' into unstable
Redis 6.0.5
Former-commit-id: b736a95b0d23e4b73daa88c676b76d1d18e8bd17
|
2020-07-13 00:55:23 +00:00 |
|
John Sully
|
cece963cf3
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
John Sully
|
67b7d512cb
|
Merge commit 'cb683a84f7a9d530bec629f2b656e7d0842a0f75' into unstable
Former-commit-id: 817a11ff110772893eda0675912bbb0cfc1fca74
|
2020-05-22 15:56:35 -04:00 |
|
John Sully
|
05cc1fd3de
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
5dbcd55669
|
Merge commit '51c1a9f8fbc12a9276489178242e498bb6ccbdba' into redis_6_merge
Former-commit-id: 09e8fb17cd0889ad17461e48446221b3955f5a8f
|
2020-04-14 18:44:42 -04:00 |
|
John Sully
|
b7a60588c1
|
Merge branch 'unstable' into keydbpro
Former-commit-id: f3457e2a9a8464bac656b57256316bbddb65d9e9
|
2020-02-16 04:04:34 -05:00 |
|
John Sully
|
ee99605def
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 18a5f46b6138e8a975dda0ed4897d19eed756d24
|
2020-02-11 02:39:08 -05:00 |
|
John Sully
|
9cd3b8253d
|
Ensure multi-master works for ring topologies
Former-commit-id: a7cc3aac28ccec4dadb80aa2cc7279c53982bc28
|
2020-02-10 00:25:03 -05:00 |
|
John Sully
|
14cf73deaa
|
Merge KeyDB 6
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
|
2020-01-29 12:55:23 -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
|
e4482cb695
|
Hide the database dict
Former-commit-id: 024365521c2b74275839562ba9326b6ea26d3836
|
2019-10-13 15:13:01 -04: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
|
871c86717c
|
Fix test failures due to assert
Former-commit-id: 9c901eb65f98008f0962c5edc33aadc15ec6f619
|
2019-06-17 23:00:12 -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
|
7859e0562f
|
Move remaning files dependent on server.h over to C++
Former-commit-id: 8c133b605c65212b023d35b3cb71e63b6a4c443a
|
2019-04-08 01:00:48 -04:00 |
|