Commit Graph
10 Commits
Author SHA1 Message Date
Malavan Sotheeswaran 2498e0fc1f fix macos build warnings/ remove 32 bit CI run (#522)
* fix macos build warnings

* remove 32 bit ci run as we no longer support it
2022-12-15 15:49:44 -05:00
John Sully 59a45d00fe Fix MALLOC=memkind build issues 2022-04-13 14:07:14 -04:00
John Sully 5267928381 Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17
2021-05-21 05:54:39 +00:00
John Sully fe8efa916b Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0
2021-05-19 02:59:48 +00:00
christianEQ 358debebfa Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: dadce055f8
2021-01-26 21:43:09 +00:00
Hanif Bin Ariffin bb67320752 Removed dead code from a macro in zmalloc.cpp
I think the compiler would have removed this no-op anyways but it
definitely wasted me some 30 minutes on this :(

I was hoping I could remove the branch through some bit-hacking but
apparently its dead code :). Oh well, its 30 minutes of refreshing
bit hacking.

Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>

Former-commit-id: 8171e6de13
2020-10-03 20:41:26 -04:00
John Sully e09a2ac94a OS X build break
Former-commit-id: 5e6b4ab99e
2020-04-15 22:43:40 -04:00
John Sully 8e5fe97525 Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf
2020-01-27 02:55:48 -05:00
John Sully b5e25f876f Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2
2019-04-16 23:16:03 -04:00
John Sully 9275a54485 Fix module linking and crashing issues
Former-commit-id: 1c953a4d5b
2019-04-16 13:34:22 -04:00