John Sully
|
68c50ae876
|
Merge commit '6718d5d37517bd927635649708913affb98f67c9' into redis_6_merge
Former-commit-id: ef1236b6009ebd7b00f6dd2f43df57ad95e51253
|
2020-04-14 20:19: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
|
2c049c16a2
|
Merge commit '79e8b17d7b44c793d8b22668b8583a297ee1b387' into redis_6_merge
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
|
2020-04-14 20:09:53 -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
|
6df76a3bfa
|
Merge commit 'a8e2bbe8f6a3f4833f286cc5049e6b52c87de1a9' into redis_6_merge
Former-commit-id: 5589a0a69ca6f5798b750a6a79f7e9b44d20e136
|
2020-04-14 19:22:44 -04:00 |
|
John Sully
|
947bf289a5
|
Merge commit 'f42ce57d0f7eee6705fb0a81714cabe97a4f2c0a' into redis_6_merge
Former-commit-id: 5589a0a69ca6f5798b750a6a79f7e9b44d20e136
|
2020-04-14 19:22:44 -04:00 |
|
John Sully
|
bdcdd1396b
|
merge
Former-commit-id: 187773190f153f8a7236bc2e4f42bffe6885f727
|
2020-03-26 01:16:36 -04:00 |
|
John Sully
|
138ce49a96
|
merge
Former-commit-id: 187773190f153f8a7236bc2e4f42bffe6885f727
|
2020-03-26 01:16:36 -04:00 |
|
John Sully
|
9c4b66b9a4
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 908cf5042ebcd7870166bd1a0bb450f37e5f3b4d
|
2020-03-25 22:12:22 -04:00 |
|
John Sully
|
aaa751acb8
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 908cf5042ebcd7870166bd1a0bb450f37e5f3b4d
|
2020-03-25 22:12:22 -04:00 |
|
John Sully
|
71fe6f7ba9
|
Fix issue #143
Former-commit-id: 6ec1641294b23e22a2a5dc5cc6098a02ce234df3
|
2020-03-25 21:55:31 -04:00 |
|
John Sully
|
356ed25c62
|
Fix issue #143
Former-commit-id: 6ec1641294b23e22a2a5dc5cc6098a02ce234df3
|
2020-03-25 21:55:31 -04:00 |
|
John Sully
|
1fc4cb38ce
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 44f1b065ed6d3b0ad2a62f093432743b98fad6be
|
2020-03-25 15:47:24 -04:00 |
|
John Sully
|
3eb99b4811
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 44f1b065ed6d3b0ad2a62f093432743b98fad6be
|
2020-03-25 15:47:24 -04:00 |
|
John Sully
|
b1c9dcaa05
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 718aee242dd75abd16a5a6a89353d2a35f37b010
|
2020-03-25 15:47:12 -04:00 |
|
John Sully
|
af459476ea
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 718aee242dd75abd16a5a6a89353d2a35f37b010
|
2020-03-25 15:47:12 -04:00 |
|
John Sully
|
1b9ef774da
|
Fix lock inversion in processEventsWhileBlocked
Former-commit-id: a9249d4a82a0f0355ac8ffa40b34b9c14cabf66b
|
2020-03-19 15:28:39 -04:00 |
|
John Sully
|
4d5d7ed59f
|
Fix lock inversion in processEventsWhileBlocked
Former-commit-id: a9249d4a82a0f0355ac8ffa40b34b9c14cabf66b
|
2020-03-19 15:28:39 -04:00 |
|
John Sully
|
96be5f6a6c
|
Prevent dangling lock when we can't free the client
Former-commit-id: 3c373494d63b21744b264f0a47e6999bcdda6b2b
|
2020-03-19 14:34:23 -04:00 |
|
John Sully
|
87626299a6
|
Prevent dangling lock when we can't free the client
Former-commit-id: 3c373494d63b21744b264f0a47e6999bcdda6b2b
|
2020-03-19 14:34:23 -04:00 |
|
John Sully
|
4ccd0c7a0f
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: bef19fefeb293e44e31dfefe383eef99e4cd7721
|
2020-03-04 17:15:54 -05:00 |
|
John Sully
|
b29f96e007
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: bef19fefeb293e44e31dfefe383eef99e4cd7721
|
2020-03-04 17:15:54 -05:00 |
|
John Sully
|
e39dd04f6c
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 52fd4445a472fa3112e96c6a7ef66ecdfe6ce9f5
|
2020-03-04 17:13:01 -05:00 |
|
John Sully
|
a669a40ac6
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 52fd4445a472fa3112e96c6a7ef66ecdfe6ce9f5
|
2020-03-04 17:13:01 -05:00 |
|
John Sully
|
01a85ba7fe
|
Add extra logging when reporting errors from masters - especially in rreplay
Former-commit-id: 5397f0b03312b8cace07a85333d8f035bdfb8d57
|
2020-03-04 17:09:12 -05:00 |
|
John Sully
|
de2b08c3f8
|
Add extra logging when reporting errors from masters - especially in rreplay
Former-commit-id: 5397f0b03312b8cace07a85333d8f035bdfb8d57
|
2020-03-04 17:09:12 -05:00 |
|
John Sully
|
dfd7e80228
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 82b957be47c828238554ba8b365e2d0a45994bc2
|
2020-02-17 19:56:07 -05:00 |
|
John Sully
|
20924db872
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 82b957be47c828238554ba8b365e2d0a45994bc2
|
2020-02-17 19:56:07 -05:00 |
|
John Sully
|
8d720e220d
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 32f34f63fd1025ae8337e8f30e9622abf08ee014
|
2020-02-17 19:55:29 -05:00 |
|
John Sully
|
1abc602081
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 32f34f63fd1025ae8337e8f30e9622abf08ee014
|
2020-02-17 19:55:29 -05:00 |
|
John Sully
|
1d368edc10
|
Add double unlock detection and improve fastlock_unlock assmebly
Former-commit-id: 98aefac09b6b59371e6c1c77d1ef2794bfc5ae62
|
2020-02-17 19:54:05 -05:00 |
|
John Sully
|
c2ef5957ef
|
Add double unlock detection and improve fastlock_unlock assmebly
Former-commit-id: 98aefac09b6b59371e6c1c77d1ef2794bfc5ae62
|
2020-02-17 19:54:05 -05:00 |
|
John Sully
|
2c28a3f3d7
|
processEventsWhileBlocked not exception safe
Former-commit-id: 45b711f9d124a948a66e667992176b5387943512
|
2020-02-17 19:04:11 -05:00 |
|
John Sully
|
d90ebb9f85
|
processEventsWhileBlocked not exception safe
Former-commit-id: 45b711f9d124a948a66e667992176b5387943512
|
2020-02-17 19:04:11 -05:00 |
|
John Sully
|
c810823abe
|
processEventsWhileBlocked not exception safe
Former-commit-id: 1ef187533c26bfa0c084a815b8b80de92ba1cf0b
|
2020-02-17 19:03:49 -05:00 |
|
John Sully
|
96c4f5ecfc
|
processEventsWhileBlocked not exception safe
Former-commit-id: 1ef187533c26bfa0c084a815b8b80de92ba1cf0b
|
2020-02-17 19:03:49 -05:00 |
|
John Sully
|
0adc93ab41
|
processEventsWhileBlocked not exception safe
Former-commit-id: 432543956c74351a12af2cb258a7a0ba5daa9b27
|
2020-02-17 18:57:13 -05:00 |
|
John Sully
|
0b315702c2
|
processEventsWhileBlocked not exception safe
Former-commit-id: 432543956c74351a12af2cb258a7a0ba5daa9b27
|
2020-02-17 18:57:13 -05:00 |
|
John Sully
|
e216a1f386
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4bd4159e2d8a7cdd0af9719776dca3e7d161d166
|
2020-02-11 03:48:24 -05:00 |
|
John Sully
|
2af2e5c730
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4bd4159e2d8a7cdd0af9719776dca3e7d161d166
|
2020-02-11 03:48:24 -05:00 |
|
John Sully
|
968e668245
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 329519d4aa230a9f7f2d3b82158f8cafcbbd6952
|
2020-02-11 03:48:08 -05:00 |
|
John Sully
|
d1885547f2
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 329519d4aa230a9f7f2d3b82158f8cafcbbd6952
|
2020-02-11 03:48:08 -05:00 |
|
John Sully
|
4748094356
|
Fix race condition in allocating connections to threads
Former-commit-id: 52434a583aa7114ff5658226441ab82ed3110a57
|
2020-02-11 03:44:28 -05:00 |
|
John Sully
|
da293758fc
|
Fix race condition in allocating connections to threads
Former-commit-id: 52434a583aa7114ff5658226441ab82ed3110a57
|
2020-02-11 03:44:28 -05:00 |
|
John Sully
|
23e7de94a8
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4091800e499cade8bc188c9e6f52f535c500f282
|
2020-02-11 02:54:24 -05:00 |
|
John Sully
|
a52e7fa2af
|
Merge branch 'redis_6_merge' into keydbpro
Former-commit-id: 4091800e499cade8bc188c9e6f52f535c500f282
|
2020-02-11 02:54:24 -05:00 |
|
John Sully
|
fbaa46505c
|
Merge branch 'unstable' into redis_6_merge
Former-commit-id: 18a5f46b6138e8a975dda0ed4897d19eed756d24
|
2020-02-11 02:39:08 -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
|
d4c1e98124
|
Implement an error handler so bug #125 can't happen
Former-commit-id: 16a019dba053fd0654116ff98a2ad0b66a9ed4e6
|
2020-02-11 01:41:00 -05:00 |
|
John Sully
|
e30630d53b
|
Implement an error handler so bug #125 can't happen
Former-commit-id: 16a019dba053fd0654116ff98a2ad0b66a9ed4e6
|
2020-02-11 01:41:00 -05:00 |
|