gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,350 Commits 1 Branch 0 Tags
Commit Graph

27350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Sully
e48c132d35 Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis 
Note: some tests failing

Former-commit-id: 86d7276f24f0cf1a0eceb6cd00a6a0ae2a0fa520
 2019-05-11 02:20:34 -04:00
John Sully
35a4c694e6 Add byline to logo 
Former-commit-id: 09186514381019ce6d07f5d0d78d19e229b00c84
 2019-05-10 23:48:14 -04:00
John Sully
b9b955044b Add byline to logo 
Former-commit-id: 09186514381019ce6d07f5d0d78d19e229b00c84
 2019-05-10 23:48:14 -04:00
Salvatore Sanfilippo
d7dd023bfd Merge pull request #6053 from soloestoy/enhance-aof-fsync-everysec 
aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985
 2019-05-10 18:06:40 +02:00
Salvatore Sanfilippo
e633254ccf
Merge pull request #6053 from soloestoy/enhance-aof-fsync-everysec 
aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985
 2019-05-10 18:06:40 +02:00
Salvatore Sanfilippo
2395eeb6e0 Merge pull request #6074 from trevor211/fixActiveExpire 
Do not active expire keys in the background when the switch is off.
 2019-05-10 12:39:35 +02:00
Salvatore Sanfilippo
34f6d94701
Merge pull request #6074 from trevor211/fixActiveExpire 
Do not active expire keys in the background when the switch is off.
 2019-05-10 12:39:35 +02:00
Salvatore Sanfilippo
472ac2de18 Merge pull request #6080 from soloestoy/fix-makefile 
Makefile: 1TD -> STD
 2019-05-10 12:37:07 +02:00
Salvatore Sanfilippo
1e9b8d853d
Merge pull request #6080 from soloestoy/fix-makefile 
Makefile: 1TD -> STD
 2019-05-10 12:37:07 +02:00
Salvatore Sanfilippo
4d889fd390 Merge pull request #6073 from yossigo/fix/blocked-client-id 
Preserve client->id for blocked clients.
 2019-05-10 12:32:47 +02:00
Salvatore Sanfilippo
2903c56bda
Merge pull request #6073 from yossigo/fix/blocked-client-id 
Preserve client->id for blocked clients.
 2019-05-10 12:32:47 +02:00
Salvatore Sanfilippo
a16964bac7 Merge pull request #6081 from Happy4Code/mod_comments 
change the comments there may have a mis type
 2019-05-10 12:28:12 +02:00
Salvatore Sanfilippo
6b490e33c4
Merge pull request #6081 from Happy4Code/mod_comments 
change the comments there may have a mis type
 2019-05-10 12:28:12 +02:00
Salvatore Sanfilippo
330835e25a Merge pull request #6077 from zltl/patch-7 
delete sdsTest() from REDIS_TEST in server.c to fix build failed
 2019-05-10 12:27:47 +02:00
Salvatore Sanfilippo
891f4a38f6
Merge pull request #6077 from zltl/patch-7 
delete sdsTest() from REDIS_TEST in server.c to fix build failed
 2019-05-10 12:27:47 +02:00
Salvatore Sanfilippo
3ef55a1e77 Merge pull request #6083 from tangquanawj/fix-inappropriate-add-operation-code 
fix-inappropriate-add-operation-code
 2019-05-10 12:25:18 +02:00
Salvatore Sanfilippo
433f763814
Merge pull request #6083 from tangquanawj/fix-inappropriate-add-operation-code 
fix-inappropriate-add-operation-code
 2019-05-10 12:25:18 +02:00
Salvatore Sanfilippo
ebd56c0ff3 Merge pull request #6086 from yongman/fix-uint64-in-defrag 
Fix uint64_t hash value in active defrag
 2019-05-10 12:23:59 +02:00
Salvatore Sanfilippo
402b0d0bd1
Merge pull request #6086 from yongman/fix-uint64-in-defrag 
Fix uint64_t hash value in active defrag
 2019-05-10 12:23:59 +02:00
Salvatore Sanfilippo
b799ed1f99 Merge pull request #6087 from AngusP/linux-build-warnings 
[Minor] Fix build warnings on Linux
 2019-05-10 12:23:42 +02:00
Salvatore Sanfilippo
19c3d5b743
Merge pull request #6087 from AngusP/linux-build-warnings 
[Minor] Fix build warnings on Linux
 2019-05-10 12:23:42 +02:00
Salvatore Sanfilippo
226a07fbcb Merge pull request #6091 from soloestoy/fix-test-skip-till 
test cases: skiptill -> skip-till
 2019-05-10 12:22:19 +02:00
Salvatore Sanfilippo
1212f22858
Merge pull request #6091 from soloestoy/fix-test-skip-till 
test cases: skiptill -> skip-till
 2019-05-10 12:22:19 +02:00
zhaozhao.zz
1e45354eb6 test cases: skiptill -> skip-till 2019-05-10 16:27:25 +08:00
zhaozhao.zz
c64aec9ce7 test cases: skiptill -> skip-till 2019-05-10 16:27:25 +08:00
John Sully
1efbf15086 Fix CentOS build failure 
Former-commit-id: 272d9297b6c022abbd4eeef890a0e1f41fc0536d
 2019-05-09 19:54:34 -04:00
John Sully
0f2c05adea Fix CentOS build failure 
Former-commit-id: 272d9297b6c022abbd4eeef890a0e1f41fc0536d
 2019-05-09 19:54:34 -04:00
John Sully
8c6e5aae98 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable 
Former-commit-id: f5bfc71899f607b4a6db9b1c7fa224b1e7a0cb79
 2019-05-09 19:16:50 -04:00
John Sully
c84ab4a822 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable 
Former-commit-id: f5bfc71899f607b4a6db9b1c7fa224b1e7a0cb79
 2019-05-09 19:16:50 -04:00
John Sully
3f9b9fd718 build break fix 
Former-commit-id: 42e1ded55fa33f8a45dc0041fd4c6376eab5f0b9
 2019-05-09 19:16:31 -04:00
John Sully
6e00cc15dd build break fix 
Former-commit-id: 42e1ded55fa33f8a45dc0041fd4c6376eab5f0b9
 2019-05-09 19:16:31 -04:00
John Sully
b57a72fa2c Fix issue #11 
Former-commit-id: 6c410af5a89aa9c11df67e04d1cfbde55aa7fe90
 2019-05-09 19:14:10 -04:00
John Sully
4aa0008f7f Fix issue #11 
Former-commit-id: 6c410af5a89aa9c11df67e04d1cfbde55aa7fe90
 2019-05-09 19:14:10 -04:00
John Sully
302e35de6b Fix typo 
Former-commit-id: 57ae67618130fb03a3397bba923627eeb037b645
 2019-05-09 19:06:58 -04:00
John Sully
403a72e70d Fix typo 
Former-commit-id: 57ae67618130fb03a3397bba923627eeb037b645
 2019-05-09 19:06:58 -04:00
John Sully
57539d2ce4 Add missing file 
Former-commit-id: 7896ca6e52b9caa9d8ab78145f16872fe488c4bb
 2019-05-09 19:05:09 -04:00
John Sully
cfd9b5e6ee Add missing file 
Former-commit-id: 7896ca6e52b9caa9d8ab78145f16872fe488c4bb
 2019-05-09 19:05:09 -04:00
John Sully
58b4650c5a Change debug messages to reference KeyDB 
Former-commit-id: c4a315dd5ece321dad02401356d9523e54f91024
 2019-05-09 19:03:50 -04:00
John Sully
d74a109d6e Change debug messages to reference KeyDB 
Former-commit-id: c4a315dd5ece321dad02401356d9523e54f91024
 2019-05-09 19:03:50 -04:00
John Sully
3d2b9e3ab8 Fix module locking issues 
Former-commit-id: bf26959b722285f9b8caedb853e712d5b4ce6b3f
 2019-05-09 19:00:27 -04:00
John Sully
e69b51a6d4 Fix module locking issues 
Former-commit-id: bf26959b722285f9b8caedb853e712d5b4ce6b3f
 2019-05-09 19:00:27 -04:00
Angus Pearson
8752868c1d Enlarge error buffer in redis-check-aof.c to remove compiler warning of output truncation through snprintf format string 2019-05-08 12:13:45 +01:00
Angus Pearson
a1fb0be1d7 Enlarge error buffer in redis-check-aof.c to remove compiler warning of output truncation through snprintf format string 2019-05-08 12:13:45 +01:00
Angus Pearson
285bcac992 Add <strings.h> include to deps/hiredis/read.c to fix Implicit Declaration of strcasecmp warning 2019-05-08 11:36:31 +01:00
Angus Pearson
bea09a7fa6 Add <strings.h> include to deps/hiredis/read.c to fix Implicit Declaration of strcasecmp warning 2019-05-08 11:36:31 +01:00
yongman
58fb679d82 Fix uint64_t hash value in active defrag 2019-05-08 16:29:16 +08:00
yongman
fb4ee7f0c5 Fix uint64_t hash value in active defrag 2019-05-08 16:29:16 +08:00
唐权
8713082973 Update ziplist.c 
Hi, @antirez

In the code, to get the size of ziplist, "unsigned int bytes = ZIPLIST_HEADER_SIZE+1;" is correct, 
but why not make it more readable and easy to understand
 2019-05-08 12:53:56 +08:00
唐权
842dd85b26
Update ziplist.c 
Hi, @antirez

In the code, to get the size of ziplist, "unsigned int bytes = ZIPLIST_HEADER_SIZE+1;" is correct, 
but why not make it more readable and easy to understand
 2019-05-08 12:53:56 +08:00
Salvatore Sanfilippo
cf6865d34e Merge pull request #6082 from soloestoy/fix-config-rewrite-memleak 
fix memory leak when rewrite config file
 2019-05-07 10:25:13 +02:00