gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,312 Commits 1 Branch 0 Tags
Commit Graph

75 Commits

Author SHA1 Message Date
John Sully
dd65d4af44 Fix ASAN use after free 2022-08-23 06:37:26 +00:00
John Sully
e3f186e698 Fix certificate leak during connection when tls-allowlists are used 2022-07-14 04:36:51 +00:00
christianEQ
b785b03068 Merge remote-tracking branch 'opensource/RELEASE_6' into keydbpro 
Former-commit-id: 439c655a543f4d3224d90bcdeb21ba43c2ab8ab7
 2022-01-14 22:19:42 +00:00
VivekSainiEQ
bfcea943ea Merge remote-tracking branch 'mainpro/PRO_RELEASE_6' into keydbpro 
Former-commit-id: 5a32d66ee382b6d227a67073afc81ca058d605ed
 2021-12-06 20:43:23 +00:00
VivekSainiEQ
cfc8912dac Fix failing cluster test 
Former-commit-id: 960503a4710d4379d5ebbb67d7ac82705f312913
 2021-11-22 22:21:57 +00:00
VivekSainiEQ
f9a355900a Merge remote-tracking branch 'opensource/unstable' into PRO_RELEASE_6 
Former-commit-id: 60da86471f68b13e2456e113ecd4aa117d95b134
 2021-11-12 21:12:53 +00:00
VivekSainiEQ
890de52b5c Check that cluster connection is valid before setting write handler 
Former-commit-id: 6a0a005ff2587c1c2647d3a077472b8bca38a074
 2021-11-02 17:43:17 +00:00
VivekSainiEQ
93b0482376 Resolved merge conflicts in prior commit 
Former-commit-id: b88f06b16f3d9e58ec884c61d2d074d7a489775e
 2021-10-21 22:35:15 +00:00
VivekSainiEQ
1d882b5ddd Merge tag '6.2.6' into Redis_626_Merge 
Former-commit-id: e6d7e01be6965110d487e12f40511fe0b3497695
 2021-10-21 22:33:55 +00:00
MalavanEQAlpha
e0af0bcb95 Merge pull request #313 from MalavanEQAlpha/fixissue295 
Resolve Issue #295 by speeding up keyIsExpired and setting timeout on subkey expires.

Former-commit-id: 9e5e6c2f86548b18ae27b4e1ac20c72517392b07
 2021-08-18 17:34:18 -04:00
malavan
67ffa578d7 Merge remote-tracking branch 'opensource/unstable' into keydbpro 
Former-commit-id: cf40fa5da29ba9574d20d706d0a41ca7001df95a
 2021-08-11 20:41:54 +00:00
VivekSainiEQ
2598493a62 Prevent invalid mvcc timestamps from causing critical errors 
Former-commit-id: 6f2dbb00119b1d0a1f5a2543d2c6af05f83ef5de
 2021-08-11 15:06:14 -04:00
malavan
3a379f0934 use INVALID_EXPIRE instead of -1 
Former-commit-id: 9e45984a97a293d87474f87612204a24c831a343
 2021-07-14 22:13:29 +00:00
malavan
4509c6e0a1 cleanup based on 6.2.2 merge review 
Former-commit-id: 51277b17a7ab4bb5b3f06fd5af8f26257ac35a37
 2021-07-14 15:22:27 -04:00
John Sully
6bb2075d3c Merge branch 'unstable' into keydbpro 
Former-commit-id: 81ded8a35daa5100cac7299a7d0b5f43ee7ac74f
 2021-07-09 04:41:47 +00:00
John Sully
da2aceabcf Merge tag '6.2.3' into unstable 
Former-commit-id: 1895dbb7680fa9aadf6040912e89c733abc8c706
 2021-07-09 04:40:31 +00:00
John Sully
0a0f610f17 Merge branch 'unstable' into keydbpro 
Former-commit-id: 4fd95b064648ee3d02097a1c2dabf306978b44f9
 2021-05-30 04:28:09 +00:00
John Sully
f3d74cf075 Ensure our connections are touched only on the right thread 
Former-commit-id: e8a44821d016e9f9b8ca873757d4786c4c271b7c
 2021-05-30 02:08:30 +00:00
John Sully
6b4f686f5f Merge branch 'unstable' into keydbpro 
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
 2021-05-28 23:32:46 +00:00
John Sully
5267928381 Merge tag '6.2.2' into unstable 
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
 2021-05-21 05:54:39 +00:00
John Sully
fe8efa916b Merge tag '6.2.1' into unstable 
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
 2021-05-19 02:59:48 +00:00
VivekSainiEQ
7b982ae4c5 Changed branding in various locations 
Former-commit-id: 96bca72bb4528a0789354ee4fd6bf3ab66d82bf7
 2021-05-06 20:13:45 -04:00
John Sully
e55ca3603c Fix memory leak in mvccRestore 
Former-commit-id: 165333b0fc648c79e66f04d9c8c4a1d0059fe57a
 2021-02-07 23:38:49 +00:00
John Sully
ea74c705a6 Fix memory leak in mvccRestore 
Former-commit-id: 92da1cbd0a08b66264f170a9b57ef7270f270157
 2021-02-07 23:38:09 +00:00
christianEQ
cca8d186aa Merge remote-tracking branch 'opensource/unstable' into keydbpro 
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
 2021-02-03 18:10:27 +00:00
christianEQ
13dfc4f228 fixed strncpy off-by-one errors 
Former-commit-id: b8e106a72e71bf5d8abd7d6032ff950f9722db59
 2021-01-26 23:27:28 +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
c179c98870 Fix issue where active replication doesn't replicate RDB data 
Former-commit-id: 527b7eb0742567302e0343e3acbed9814c0cbb95
 2020-11-23 02:01:40 +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
ad4c2390a8 Merge branch 'unstable' into keydbpro 
Former-commit-id: d1986d9fcdfd56f2c30ee95edef6d5260e0aa777
 2020-09-24 22:02:30 +00:00
John Sully
db193a1ef1 Merge branch 'unstable' into keydbpro 
Former-commit-id: ae482585f0dc470efd73833f74111c2f87a172c5
 2020-08-15 21:29:00 +00:00
John Sully
6a57593467 Merge branch 'PRO_RELEASE_6' into keydbpro 
Former-commit-id: bffe010ea5279bee869bc61cc6d933979e10bbea
 2020-07-13 03:32:14 +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
c83fe382ff 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
44c1e6d5e7 Merge branch 'unstable' into keydbpro 
Former-commit-id: 08a36155e3db9918048e87c3d691b7317787c9ab
 2020-06-01 17:41:37 -04:00
John Sully
29a45dfabc TLS requires we explicitly marshal connected sockets when using them on a different thread 
Former-commit-id: 341a8caef959883ca6fc71f81f8a3fed747b2341
 2020-05-30 01:14:53 -04:00
John Sully
343745f218 Cluster crash 
Former-commit-id: f25c405ad2a8004b79a816072cb011c1dc2407d5
 2020-05-29 03:40:52 -04:00
John Sully
cece963cf3 Merge branch 'unstable' into keydbpro 
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
 2020-05-24 14:41:53 -04:00
John Sully
2d783a3cbf Merge tag '6.0.2' into unstable 
Redis 6.0.2


Former-commit-id: a010e4a4b2cc2bcad1cb14604b7ebc596c35b05e
 2020-05-22 16:45:18 -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
ad1eac9856 Merge commit 'bec68bff2978de88b23140f41b6a943162333b11' into unstable 
Former-commit-id: 8ab77465dbb3c0b1f859f24cdbb461937516eb6a
 2020-05-21 19:37:42 -04:00
John Sully
24322b9b6d Merge commit 'eba28e2cea0b2632cf751426ada02adf24f273db' into unstable 
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
 2020-05-21 17:32:53 -04:00
John Sully
d1948ab944 Merge branch 'unstable' into keydbpro 
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
 2020-05-11 00:53:38 -04:00
John Sully
b752ad4ceb 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
e5a1f84582 Fix warning in cluster.cpp 
Former-commit-id: e5e33f8cb7b4c928884a934184cbf81b916b3c03
 2020-04-16 20:01:13 -04:00
John Sully
05cc1fd3de Initial merge of unstable 6 
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
 2020-04-16 16:36:16 -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
7a6933bb15 Merge commit 'e628f94436f2ffb38dd6305f18956f309838a8d6' into redis_6_merge 
Former-commit-id: 2941792a85653258a36f8eb02189132ec7835242
 2020-04-14 21:13:42 -04:00