 VivekSainiEQ
|
1ff6e37d2f
|
Merge remote-tracking branch 'opensource/unstable' into PRO_RELEASE_6
Former-commit-id: 60da86471f68b13e2456e113ecd4aa117d95b134
|
2021-11-12 21:12:53 +00:00 |
|
|
VivekSainiEQ
|
817d2c55e4
|
Resolved merge conflicts in prior commit
Former-commit-id: 1594ef5e3e9f6413d8a68d91cad8eec0dc163b4e
|
2021-10-21 22:35:15 +00:00 |
|
|
VivekSainiEQ
|
443f8d8f9b
|
Merge tag '6.2.6' into Redis_626_Merge
Former-commit-id: a4220f27d308863d77feab1713a920add23062ff
|
2021-10-21 22:33:55 +00:00 |
|
 John Sully
|
88521a9dfb
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 81ded8a35daa5100cac7299a7d0b5f43ee7ac74f
|
2021-07-09 04:41:47 +00:00 |
|
|
John Sully
|
9c841628da
|
Merge tag '6.2.3' into unstable
Former-commit-id: 1895dbb768
|
2021-07-09 04:40:31 +00:00 |
|
|
John Sully
|
7d6aa9ada3
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
|
2021-05-28 23:32:46 +00:00 |
|
|
John Sully
|
25f083a1f4
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17
|
2021-05-21 05:54:39 +00:00 |
|
|
John Sully
|
f6b81914d8
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0
|
2021-05-19 02:59:48 +00:00 |
|
 christianEQ
|
c6bff25bdd
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
|
2021-02-03 18:10:27 +00:00 |
|
|
christianEQ
|
3a13377335
|
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: 3cdace182152727b2b19362072ab5f6ad55e2cd5
|
2021-01-26 21:43:09 +00:00 |
|
|
John Sully
|
3eb20eef14
|
RocksDB Read Performance Improvements
Former-commit-id: 80cca4869888e048e10e11f1f20796c482c3e5b3
|
2020-08-09 23:36:20 +00:00 |
|
|
John Sully
|
98c33c2c6f
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
|
John Sully
|
9cbe9da4ba
|
Merge commit 'd7b07d3ded06b4cd843baffd3a6d33dd96efd401' into unstable
Former-commit-id: b21357ca23e56a3f90b01f97239ff932d1563f0e
|
2020-05-21 18:48:49 -04:00 |
|
|
John Sully
|
56052c2595
|
Merge commit 'c5d805f87771581d3f6b29861ed2062c0ae2a688' into unstable
Former-commit-id: 36a1e6ad2d9917c4676f53f3dc033da10e778f83
|
2020-05-21 17:45:15 -04:00 |
|
|
John Sully
|
f16e51683a
|
Free memory before we enter a script and may not have a chance
Former-commit-id: 7a3173c74ca617b4d0f9e852ab580731fa92f3df
|
2020-05-08 00:15:58 -04:00 |
|
|
John Sully
|
923f772e52
|
Merge commit '491949ee5bf4ffbfc746ea4ed5a6d673b0e2fb81' into redis_6_merge
Former-commit-id: 98bf4812570727290d1c16153c79c1bbcd548258
|
2020-04-14 18:44:42 -04:00 |
|
|
John Sully
|
1bfe7d0804
|
Fix most tests (still some failures)
Former-commit-id: 5a7b9a3b1e3b6cb8e2aa2b18e96b5c0c13a59c8a
|
2020-01-27 18:16:19 -05:00 |
|
|
John Sully
|
d815f5e0b5
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: 6c77453720e0451158376df5511ed8c121d47d35
|
2020-01-27 02:55:48 -05:00 |
|
|
John Sully
|
f39e8d7545
|
Update more slave instances to use replica (Issue #75)
Former-commit-id: 57cf1ee82eabc428d0c61621feb4be403e602a78
|
2019-10-13 12:29:20 -04:00 |
|
|
John Sully
|
9466ff7837
|
New expire datastructure and algorithm. Allows us to expire in sublinear time
Former-commit-id: 627da9a2d68d68c0dc73661cebd62d1ce16f462b
|
2019-07-23 18:30:10 -04:00 |
|
|
John Sully
|
1cc6b11a20
|
Fix deadlock with client and ae locks
Former-commit-id: 0326e52ede59df932f073e7e97811f746b523b43
|
2019-07-12 20:46:50 -04:00 |
|
|
John Sully
|
d6cb1bae74
|
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: 1abfb5828b5ee569d4373e40255a0eb87434759d
|
2019-04-21 14:01:10 -04:00 |
|
|
John Sully
|
ddebaad770
|
Factor out some normally const globals
Former-commit-id: e6ee321919efa1fae6643444b5df14add1f97830
|
2019-04-21 13:20:45 -04:00 |
|
|
John Sully
|
efa4efb939
|
Start of MVCC support (and more C++)
Former-commit-id: 21dd60095553fba9b821bbbcefeaf4ae97250d5b
|
2019-04-16 23:16:03 -04:00 |
|
|
John Sully
|
4cc78e47ee
|
Merge branch 'unstable' into wip-multimaster
Former-commit-id: a79e37be953a263ee7a3b5607d02a61b5a8b154f
|
2019-04-03 00:12:13 -04:00 |
|
|
John Sully
|
364f3715af
|
Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: fbee5282424d932f3fcf1377050c22a05170ab95
|
2019-04-03 00:00:38 -04:00 |
|
|
John Sully
|
e27ac2fd25
|
It compiles and doesn't crash immediately!
Former-commit-id: bfa8b8543553f3d7142eadc17bdef982952d1798
|
2019-04-02 16:47:05 -04:00 |
|
|
John Sully
|
538df67ba9
|
Module threading fixes
Former-commit-id: 6e830e357135b02aef47e90fafcad9b08684a111
|
2019-03-07 19:13:01 -05:00 |
|
|
John Sully
|
30e8a859c0
|
Prevent mixed up client replies, and deadlocks
|
2019-02-22 01:24:16 -05:00 |
|
|
John Sully
|
2788cf57b0
|
Implement try_lock
|
2019-02-22 01:23:31 -05:00 |
|