John Sully
|
ed2e0e66f6
|
Merge tag '6.0.4' into unstable
Redis 6.0.4.
Former-commit-id: 9c31ac7925edba187e527f506e5e992946bd38a6
|
2020-05-29 00:57:07 -04:00 |
|
John Sully
|
cfe9f8f3bc
|
Merge tag '6.0.4' into unstable
Redis 6.0.4.
Former-commit-id: 9c31ac7925edba187e527f506e5e992946bd38a6
|
2020-05-29 00:57:07 -04:00 |
|
John Sully
|
f617eafbe1
|
Merge branch 'unstable' into keydbpro
Former-commit-id: b0636273806ce323627ce31c1ad7f86ceb39696d
|
2020-05-26 01:34:19 -04:00 |
|
John Sully
|
d50c0c5ba3
|
Merge branch 'unstable' into keydbpro
Former-commit-id: b0636273806ce323627ce31c1ad7f86ceb39696d
|
2020-05-26 01:34:19 -04:00 |
|
John Sully
|
845027c291
|
Enable TLS connections
Former-commit-id: d05da0fabdfeb7eadce6546c7c1d85739b2794d7
|
2020-05-24 19:57:16 -04:00 |
|
John Sully
|
fcfff165da
|
Enable TLS connections
Former-commit-id: d05da0fabdfeb7eadce6546c7c1d85739b2794d7
|
2020-05-24 19:57:16 -04:00 |
|
John Sully
|
e0a0d93a07
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
John Sully
|
cece963cf3
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
John Sully
|
7630b63f06
|
Hold the AE lock until we process the repl backlog after a command
Former-commit-id: 4893eedacbf5f9210d02361ed07b9beee0c9f655
|
2020-05-24 11:19:23 -04:00 |
|
John Sully
|
23e1601276
|
Hold the AE lock until we process the repl backlog after a command
Former-commit-id: 4893eedacbf5f9210d02361ed07b9beee0c9f655
|
2020-05-24 11:19:23 -04:00 |
|
John Sully
|
d3bd1ab56b
|
Fix ASAN races
Former-commit-id: 8665f250314c4e3de32f3b31a2c0158908ef982b
|
2020-05-24 01:58:33 -04:00 |
|
John Sully
|
dc27b95a47
|
Fix ASAN races
Former-commit-id: 8665f250314c4e3de32f3b31a2c0158908ef982b
|
2020-05-24 01:58:33 -04:00 |
|
John Sully
|
dde860c60b
|
If we request shutdown from a client on a different thread than a blocking lua script we fail to actually shutdown until the script completes
Former-commit-id: 1ca6c1dd56131bc28fe9f831e2b9cab7adb846a3
|
2020-05-24 01:56:23 -04:00 |
|
John Sully
|
926da1f899
|
If we request shutdown from a client on a different thread than a blocking lua script we fail to actually shutdown until the script completes
Former-commit-id: 1ca6c1dd56131bc28fe9f831e2b9cab7adb846a3
|
2020-05-24 01:56:23 -04:00 |
|
John Sully
|
3813d5835e
|
During RDB load we can only handle clients on the main thread as our workers are not yet created. This change also unifies the accept logic across the socket types
Former-commit-id: 59cda9cfb96eca55c4b445309970bd95277ebc5c
|
2020-05-23 16:03:24 -04:00 |
|
John Sully
|
18b8a83ecb
|
During RDB load we can only handle clients on the main thread as our workers are not yet created. This change also unifies the accept logic across the socket types
Former-commit-id: 59cda9cfb96eca55c4b445309970bd95277ebc5c
|
2020-05-23 16:03:24 -04:00 |
|
ShooterIT
|
646cc81c96
|
Fix reply bytes calculation error
Fix #7275.
Former-commit-id: a12210c87561fed5522c9a6e8db6d8606cabe3bf
|
2020-05-23 13:02:55 -04:00 |
|
ShooterIT
|
23b4dc503a
|
Fix reply bytes calculation error
Fix #7275.
Former-commit-id: a12210c87561fed5522c9a6e8db6d8606cabe3bf
|
2020-05-23 13:02:55 -04:00 |
|
John Sully
|
36032618b2
|
Merge tag '6.0.3' into unstable
Redis 6.0.3
Former-commit-id: 43649fc5b4425fb05e2c1aa48da7c07bc83ce24d
|
2020-05-22 16:53:10 -04:00 |
|
John Sully
|
db7f0572a3
|
Merge tag '6.0.3' into unstable
Redis 6.0.3
Former-commit-id: 43649fc5b4425fb05e2c1aa48da7c07bc83ce24d
|
2020-05-22 16:53:10 -04:00 |
|
John Sully
|
fa0be83fd9
|
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
|
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
|
c03e9a3e2c
|
Merge commit 'e834acb91c89d083d0075e320dea6ad7188f2d0d' into unstable
Former-commit-id: 817a11ff110772893eda0675912bbb0cfc1fca74
|
2020-05-22 15:56:35 -04:00 |
|
John Sully
|
67b7d512cb
|
Merge commit 'cb683a84f7a9d530bec629f2b656e7d0842a0f75' into unstable
Former-commit-id: 817a11ff110772893eda0675912bbb0cfc1fca74
|
2020-05-22 15:56:35 -04:00 |
|
John Sully
|
bd3deb6c67
|
Merge commit '05b332e550e7ce32e364dde6cdd8820e8665eb21' into unstable
Former-commit-id: c52e1fc78c369843e49a22765bed2c53e99d9709
|
2020-05-22 15:42:50 -04:00 |
|
John Sully
|
df7ac419d0
|
Merge commit '3a441c7d95c8757d2ab12ff730cc7ca8899538c9' into unstable
Former-commit-id: c52e1fc78c369843e49a22765bed2c53e99d9709
|
2020-05-22 15:42:50 -04:00 |
|
John Sully
|
2fa3fb9573
|
Merge tag '6.0.1' into unstable
Redis 6.0.1.
Former-commit-id: c505df8830123904da026be2aacbd92a95a5e37c
|
2020-05-21 23:41:36 -04:00 |
|
John Sully
|
8f8dea57db
|
Merge tag '6.0.1' into unstable
Redis 6.0.1.
Former-commit-id: c505df8830123904da026be2aacbd92a95a5e37c
|
2020-05-21 23:41:36 -04:00 |
|
John Sully
|
193d7c76cb
|
Fix bad merge in CI.yml
Former-commit-id: 6311d709c39b3bacaeab77b18033010f1b548f81
|
2020-05-21 22:09:06 -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
|
ccedb2fa73
|
Merge commit 'd7b07d3ded06b4cd843baffd3a6d33dd96efd401' into unstable
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
|
2020-05-21 18:48:49 -04:00 |
|
John Sully
|
3384af024d
|
Merge commit 'cbcd07777dc569618a34f59e5fd0de53178f4f1d' into unstable
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
|
2020-05-21 18:48:49 -04:00 |
|
John Sully
|
b47d7715a4
|
Merge commit '71134e357ffd6ced7c40c145205dbbac173ee181' into unstable
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
|
2020-05-21 17:32:53 -04:00 |
|
John Sully
|
24322b9b6d
|
Merge commit 'eba28e2cea0b2632cf751426ada02adf24f273db' into unstable
Former-commit-id: d5b057534a3dbf50f94465332107da2490811946
|
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
|
d1948ab944
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
|
2020-05-11 00:53:38 -04:00 |
|
John Sully
|
4477a8b145
|
We should still send replies even if an async close is pending
Former-commit-id: 572bcca9c2e7985782909cca22ef9e381bea55b4
|
2020-05-10 23:56:29 -04:00 |
|
John Sully
|
012228bd51
|
We should still send replies even if an async close is pending
Former-commit-id: 572bcca9c2e7985782909cca22ef9e381bea55b4
|
2020-05-10 23:56:29 -04:00 |
|
John Sully
|
344699b2ce
|
Fix race on clients_to_close
Former-commit-id: 10fa06410941121c4c9fc3cc9c553a7afe347147
|
2020-05-10 23:14:15 -04:00 |
|
John Sully
|
f0ed02448d
|
Fix race on clients_to_close
Former-commit-id: 10fa06410941121c4c9fc3cc9c553a7afe347147
|
2020-05-10 23:14:15 -04:00 |
|
John Sully
|
73c436dba2
|
Fix crash in client unblock command
Former-commit-id: 7cd779d304d75833ca891b4fe3b7e1cfdabf6fa8
|
2020-05-10 22:08:50 -04:00 |
|
John Sully
|
dc131afe1c
|
Fix crash in client unblock command
Former-commit-id: 7cd779d304d75833ca891b4fe3b7e1cfdabf6fa8
|
2020-05-10 22:08:50 -04:00 |
|
John Sully
|
f627dd8cbe
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
05cc1fd3de
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
822f64ed2f
|
During AOF reload we can erroneously read incorrect aof_state values, so this variable must be read with the global lock acquired
Former-commit-id: 6ff9d23fd4541a011d754209d9fda3ef3af4a7f9
|
2020-04-15 22:30:19 -04:00 |
|
John Sully
|
34131bf287
|
During AOF reload we can erroneously read incorrect aof_state values, so this variable must be read with the global lock acquired
Former-commit-id: 6ff9d23fd4541a011d754209d9fda3ef3af4a7f9
|
2020-04-15 22:30:19 -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
|
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
|
ce54857237
|
Merge commit '454e12cb8961f21c9dd8502dc82ae6ffd7e22fe0' into redis_6_merge
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
|
2020-04-14 22:19:29 -04:00 |
|
John Sully
|
02147b4be0
|
Merge commit '0f7dfc378ce5ab0524ac28b6142545bc41435386' into redis_6_merge
Former-commit-id: cc3ebbe5194e9744fb84ce490e90ac5fbe7f8716
|
2020-04-14 22:19:29 -04:00 |
|