 christianEQ
|
df51a33413
|
Merge remote-tracking branch 'opensource/RELEASE_6' into keydbpro
Former-commit-id: 439c655a543f4d3224d90bcdeb21ba43c2ab8ab7
|
2022-01-14 22:19:42 +00:00 |
|
 VivekSainiEQ
|
45e7b87548
|
Merge remote-tracking branch 'mainpro/PRO_RELEASE_6' into keydbpro
Former-commit-id: 5a32d66ee382b6d227a67073afc81ca058d605ed
|
2021-12-06 20:43:23 +00:00 |
|
|
VivekSainiEQ
|
f2e00755e3
|
Fix failing cluster test
Former-commit-id: 960503a4710d4379d5ebbb67d7ac82705f312913
|
2021-11-22 22:21:57 +00:00 |
|
|
VivekSainiEQ
|
7992428583
|
Merge remote-tracking branch 'opensource/unstable' into PRO_RELEASE_6
Former-commit-id: 60da86471f68b13e2456e113ecd4aa117d95b134
|
2021-11-12 21:12:53 +00:00 |
|
|
VivekSainiEQ
|
591f0c77c4
|
Check that cluster connection is valid before setting write handler
Former-commit-id: 6a0a005ff2
|
2021-11-02 17:43:17 +00:00 |
|
|
VivekSainiEQ
|
a7e7540284
|
Resolved merge conflicts in prior commit
Former-commit-id: b88f06b16f
|
2021-10-21 22:35:15 +00:00 |
|
|
VivekSainiEQ
|
b84ee93b5d
|
Merge tag '6.2.6' into Redis_626_Merge
Former-commit-id: e6d7e01be6
|
2021-10-21 22:33:55 +00:00 |
|
 MalavanEQAlpha
|
fd5f0b8ebe
|
Merge pull request #313 from MalavanEQAlpha/fixissue295
Resolve Issue #295 by speeding up keyIsExpired and setting timeout on subkey expires.
Former-commit-id: 9e5e6c2f86
|
2021-08-18 17:34:18 -04:00 |
|
 malavan
|
9f1f29543f
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: cf40fa5da29ba9574d20d706d0a41ca7001df95a
|
2021-08-11 20:41:54 +00:00 |
|
|
VivekSainiEQ
|
72e02159f4
|
Prevent invalid mvcc timestamps from causing critical errors
Former-commit-id: 6f2dbb0011
|
2021-08-11 15:06:14 -04:00 |
|
|
malavan
|
bfefd8a11b
|
use INVALID_EXPIRE instead of -1
Former-commit-id: 9e45984a97
|
2021-07-14 22:13:29 +00:00 |
|
|
malavan
|
c255a454ec
|
cleanup based on 6.2.2 merge review
Former-commit-id: 51277b17a7
|
2021-07-14 15:22:27 -04:00 |
|
 John Sully
|
2616ed75cc
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 81ded8a35daa5100cac7299a7d0b5f43ee7ac74f
|
2021-07-09 04:41:47 +00:00 |
|
|
John Sully
|
c0160a4415
|
Merge tag '6.2.3' into unstable
Former-commit-id: 1895dbb768
|
2021-07-09 04:40:31 +00:00 |
|
|
John Sully
|
702bfaee9b
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 4fd95b064648ee3d02097a1c2dabf306978b44f9
|
2021-05-30 04:28:09 +00:00 |
|
|
John Sully
|
42f5d1a175
|
Ensure our connections are touched only on the right thread
Former-commit-id: e8a44821d0
|
2021-05-30 02:08:30 +00:00 |
|
|
John Sully
|
f4151f0d6b
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
|
2021-05-28 23:32:46 +00:00 |
|
|
John Sully
|
ea6a0f214b
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17
|
2021-05-21 05:54:39 +00:00 |
|
|
John Sully
|
f49d8f9adb
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0
|
2021-05-19 02:59:48 +00:00 |
|
|
VivekSainiEQ
|
501a065759
|
Changed branding in various locations
Former-commit-id: 96bca72bb4
|
2021-05-06 20:13:45 -04:00 |
|
|
John Sully
|
aa47e643b0
|
Fix memory leak in mvccRestore
Former-commit-id: 165333b0fc
|
2021-02-07 23:38:49 +00:00 |
|
|
John Sully
|
6a7b193fc1
|
Fix memory leak in mvccRestore
Former-commit-id: 92da1cbd0a08b66264f170a9b57ef7270f270157
|
2021-02-07 23:38:09 +00:00 |
|
|
christianEQ
|
c69b2845fd
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
|
2021-02-03 18:10:27 +00:00 |
|
|
christianEQ
|
b840a1a3eb
|
fixed strncpy off-by-one errors
Former-commit-id: b8e106a72e
|
2021-01-26 23:27:28 +00:00 |
|
|
christianEQ
|
c068f2cd3d
|
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: dadce055f8
|
2021-01-26 21:43:09 +00:00 |
|
|
John Sully
|
5c832c5ad0
|
Merge branch 'unstable' into keydbpro
Former-commit-id: b7a1e16c0f04e8aeb3764e3681fa14fc0f97f6a3
|
2020-12-10 02:37:28 +00:00 |
|
|
John Sully
|
50c2a8524c
|
Fix issue where active replication doesn't replicate RDB data
Former-commit-id: 527b7eb074
|
2020-11-23 02:01:40 +00:00 |
|
|
John Sully
|
14daf6f909
|
Merge tag '6.0.8' into unstable
Former-commit-id: 4c7e4b91a6
|
2020-09-30 19:47:55 +00:00 |
|
|
John Sully
|
cb6bc67a87
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d1986d9fcdfd56f2c30ee95edef6d5260e0aa777
|
2020-09-24 22:02:30 +00:00 |
|
|
John Sully
|
c804b28446
|
Merge branch 'unstable' into keydbpro
Former-commit-id: ae482585f0dc470efd73833f74111c2f87a172c5
|
2020-08-15 21:29:00 +00:00 |
|
|
John Sully
|
8c2c0fba12
|
Merge branch 'PRO_RELEASE_6' into keydbpro
Former-commit-id: bffe010ea5279bee869bc61cc6d933979e10bbea
|
2020-07-13 03:32:14 +00:00 |
|
|
John Sully
|
f17dab1f67
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 0dafbc254a0efd5ee302d5c58fb2ca0a85110104
|
2020-07-13 03:31:47 +00:00 |
|
|
John Sully
|
84bf240caa
|
Merge tag '6.0.5' into unstable
Redis 6.0.5
Former-commit-id: b736a95b0d
|
2020-07-13 00:55:23 +00:00 |
|
|
John Sully
|
324e8e01f2
|
COW pointer is not thread safe so we need a global expire lock
Former-commit-id: ac12eef75301564d920e622a08e4f586486fd395
|
2020-06-09 19:58:42 -04:00 |
|
|
John Sully
|
df3f1e8d8e
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 08a36155e3db9918048e87c3d691b7317787c9ab
|
2020-06-01 17:41:37 -04:00 |
|
|
John Sully
|
f37ee5bd4d
|
TLS requires we explicitly marshal connected sockets when using them on a different thread
Former-commit-id: 341a8caef9
|
2020-05-30 01:14:53 -04:00 |
|
|
John Sully
|
f18ba66242
|
Cluster crash
Former-commit-id: f25c405ad2
|
2020-05-29 03:40:52 -04:00 |
|
|
John Sully
|
e0a0d93a07
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
|
John Sully
|
fa0be83fd9
|
Merge tag '6.0.2' into unstable
Redis 6.0.2
Former-commit-id: a010e4a4b2
|
2020-05-22 16:45:18 -04:00 |
|
|
John Sully
|
193d7c76cb
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c3
|
2020-05-21 22:09:06 -04:00 |
|
|
John Sully
|
e245fdbb89
|
Merge commit '97e58ee026675e70fbd8843f7a86e98f53a3c791' into unstable
Former-commit-id: 8ab77465db
|
2020-05-21 19:37:42 -04:00 |
|
|
John Sully
|
b47d7715a4
|
Merge commit '71134e357ffd6ced7c40c145205dbbac173ee181' into unstable
Former-commit-id: d5b057534a
|
2020-05-21 17:32:53 -04:00 |
|
|
John Sully
|
5ea1948d68
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
|
2020-05-11 00:53:38 -04:00 |
|
|
John Sully
|
2ab2078085
|
Fix failure to count keys in cluster slots when reloading a FLASH database
Former-commit-id: f6dd863e51f91620f184ff80f08cfe518d29c87f
|
2020-04-28 20:48:46 -04:00 |
|
|
John Sully
|
fbecb9d5c9
|
Fix warning in cluster.cpp
Former-commit-id: e5e33f8cb7
|
2020-04-16 20:01:13 -04:00 |
|
|
John Sully
|
f627dd8cbe
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
|
John Sully
|
ce54857237
|
Merge commit '454e12cb8961f21c9dd8502dc82ae6ffd7e22fe0' into redis_6_merge
Former-commit-id: cc3ebbe519
|
2020-04-14 22:19:29 -04:00 |
|
|
John Sully
|
8750cb5a3b
|
Merge commit '07c75f60f3fe0b300fd7913bab3d2d7e612afb03' into redis_6_merge
Former-commit-id: 2941792a85
|
2020-04-14 21:13:42 -04:00 |
|
|
John Sully
|
c198d81582
|
Merge commit 'dff5370c8be0dcef1728b95b17906d2494ce9bf2' into redis_6_merge
Former-commit-id: 8e33c2d301
|
2020-04-14 18:05:10 -04:00 |
|
|
John Sully
|
3fad87ca13
|
Merge branch 'unstable' into keydbpro
Former-commit-id: f3457e2a9a8464bac656b57256316bbddb65d9e9
|
2020-02-16 04:04:34 -05:00 |
|