malavan
|
9f1f29543f
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: cf40fa5da29ba9574d20d706d0a41ca7001df95a
|
2021-08-11 20:41:54 +00:00 |
|
christianEQ
|
43f31da324
|
fix warnings for mac build
Former-commit-id: 570fbd014944a655f6c8e7216f2b9226f378c7c7
|
2021-07-15 20:14:14 +00:00 |
|
John Sully
|
f4151f0d6b
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
|
2021-05-28 23:32:46 +00:00 |
|
John Sully
|
f49d8f9adb
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
|
2021-05-19 02:59:48 +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
|
c068f2cd3d
|
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
|
e0a0d93a07
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -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
|
f627dd8cbe
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
4f56e9c3b0
|
Merge commit 'e91ca9fee9c56ef319b407b104afc435be0c53cb' into redis_6_merge
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
|
2020-04-14 20:42:48 -04:00 |
|
John Sully
|
3186cb683f
|
Merge KeyDB 6
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
|
2020-01-29 12:55:23 -05:00 |
|
John Sully
|
6193e9ad4f
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf94326bf2f163db7698aad9a3c01690
|
2020-01-27 02:55:48 -05:00 |
|
John Sully
|
2e0a7b7821
|
Fix clang warnings
Former-commit-id: c4f086ae936e1ba5ed97c2f0810ddb6a4de25be6
|
2019-10-13 15:48:55 -04:00 |
|
John Sully
|
6ae796cb91
|
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: 37b2d046bef12c7ee7cac4883f0b64ddde236d74
|
2019-04-21 14:01:10 -04:00 |
|
John Sully
|
83adc0eabb
|
Factor out some normally const globals
Former-commit-id: fa2e407873fce7f936943ae1fe162d54d7bedd70
|
2019-04-21 13:20:45 -04:00 |
|
John Sully
|
0e10e4f6f5
|
Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2a7d8ca5034f2fbe8b71550f290ea64
|
2019-04-16 23:16:03 -04:00 |
|
John Sully
|
5b8893ef84
|
Fix addition RESP3 regressions (return empty set)
Former-commit-id: 740fc6c2b865f3846fc7c2b53e5b8303020964f2
|
2019-04-08 16:52:57 -04:00 |
|
John Sully
|
836e0aa80b
|
Move a bunch of files to C++
Former-commit-id: 011948bcef748df33cb18e76dc5ba48d3c5706dc
|
2019-04-07 16:54:56 -04:00 |
|