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

27381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaozhao.zz
ba78815203 aof: fix the short write 2017-11-30 10:22:12 +08:00
Itamar Haber
5252d3d8ea Check arity in SLOWLOG before accessing arg 2017-11-30 00:30:30 +02:00
Itamar Haber
0752a834f9 Check arity in SLOWLOG before accessing arg 2017-11-30 00:30:30 +02:00
Itamar Haber
22698eef45 Check arity in SLOWLOG before accessing arg 2017-11-30 00:30:30 +02:00
antirez
e7313e4372 Merge branch 'lfu-fixes' into unstable 2017-11-29 17:16:13 +01:00
antirez
2785d6caa0 Merge branch 'lfu-fixes' into unstable 2017-11-29 17:16:13 +01:00
antirez
7435fd6be9 Merge branch 'lfu-fixes' into unstable 2017-11-29 17:16:13 +01:00
Itamar Haber
b8275f187e Merge branch 'unstable' into help_subcommands 2017-11-28 21:28:40 +02:00
Itamar Haber
51d42c88a6 Merge branch 'unstable' into help_subcommands 2017-11-28 21:28:40 +02:00
Itamar Haber
0bc9d1d6f1 Merge branch 'unstable' into help_subcommands 2017-11-28 21:28:40 +02:00
Itamar Haber
50ce8124a3 Standardizes the 'help' subcommand 
This adds a new `addReplyHelp` helper that's used by commands
when returning a help text. The following commands have been
touched: DEBUG, OBJECT, COMMAND, PUBSUB, SCRIPT and SLOWLOG.

WIP

Fix entry command table entry for OBJECT for HELP option.

After #4472 the command may have just 2 arguments.

Improve OBJECT HELP descriptions.

See #4472.

WIP 2

WIP 3
 2017-11-28 21:15:45 +02:00
Itamar Haber
59d52f7fab Standardizes the 'help' subcommand 
This adds a new `addReplyHelp` helper that's used by commands
when returning a help text. The following commands have been
touched: DEBUG, OBJECT, COMMAND, PUBSUB, SCRIPT and SLOWLOG.

WIP

Fix entry command table entry for OBJECT for HELP option.

After #4472 the command may have just 2 arguments.

Improve OBJECT HELP descriptions.

See #4472.

WIP 2

WIP 3
 2017-11-28 21:15:45 +02:00
Itamar Haber
78aabf66ff Standardizes the 'help' subcommand 
This adds a new `addReplyHelp` helper that's used by commands
when returning a help text. The following commands have been
touched: DEBUG, OBJECT, COMMAND, PUBSUB, SCRIPT and SLOWLOG.

WIP

Fix entry command table entry for OBJECT for HELP option.

After #4472 the command may have just 2 arguments.

Improve OBJECT HELP descriptions.

See #4472.

WIP 2

WIP 3
 2017-11-28 21:15:45 +02:00
Salvatore Sanfilippo
0a3a92d180 Merge pull request #4200 from jeesyn/fix_typo 
fix a typo
 2017-11-28 18:44:11 +01:00
Salvatore Sanfilippo
565e139a56
Merge pull request #4200 from jeesyn/fix_typo 
fix a typo
 2017-11-28 18:44:11 +01:00
Salvatore Sanfilippo
e13b5ea614 Merge pull request #4200 from jeesyn/fix_typo 
fix a typo
 2017-11-28 18:44:11 +01:00
Salvatore Sanfilippo
47951a1d1d Merge pull request #4165 from zyegfryed/patch-1 
Fix some typos
 2017-11-28 18:43:45 +01:00
Salvatore Sanfilippo
b998e2035c
Merge pull request #4165 from zyegfryed/patch-1 
Fix some typos
 2017-11-28 18:43:45 +01:00
Salvatore Sanfilippo
5a836dc690 Merge pull request #4165 from zyegfryed/patch-1 
Fix some typos
 2017-11-28 18:43:45 +01:00
Salvatore Sanfilippo
ad06aea258 Merge pull request #4166 from charpty/wip-redisclic-typo 
redis-cli.c typo: helpe -> helper.
 2017-11-28 18:41:51 +01:00
Salvatore Sanfilippo
923502a70b
Merge pull request #4166 from charpty/wip-redisclic-typo 
redis-cli.c typo: helpe -> helper.
 2017-11-28 18:41:51 +01:00
Salvatore Sanfilippo
c847a62be6 Merge pull request #4166 from charpty/wip-redisclic-typo 
redis-cli.c typo: helpe -> helper.
 2017-11-28 18:41:51 +01:00
Salvatore Sanfilippo
8f1404310d Merge pull request #4167 from charpty/wip-redisclic-typo2 
redis-cli.c typo: Requets -> Requests.
 2017-11-28 18:41:28 +01:00
Salvatore Sanfilippo
26826329f5
Merge pull request #4167 from charpty/wip-redisclic-typo2 
redis-cli.c typo: Requets -> Requests.
 2017-11-28 18:41:28 +01:00
Salvatore Sanfilippo
35b359cdeb Merge pull request #4167 from charpty/wip-redisclic-typo2 
redis-cli.c typo: Requets -> Requests.
 2017-11-28 18:41:28 +01:00
Salvatore Sanfilippo
0e1c37fc8c Merge pull request #4170 from TehWebby/patch-2 
Fix typo
 2017-11-28 18:40:43 +01:00
Salvatore Sanfilippo
3508b9c440
Merge pull request #4170 from TehWebby/patch-2 
Fix typo
 2017-11-28 18:40:43 +01:00
Salvatore Sanfilippo
8f1d602a58 Merge pull request #4170 from TehWebby/patch-2 
Fix typo
 2017-11-28 18:40:43 +01:00
Salvatore Sanfilippo
3cae56b866 Merge pull request #4172 from TehWebby/patch-3 
Fix typo
 2017-11-28 18:40:02 +01:00
Salvatore Sanfilippo
4e55df4b5c
Merge pull request #4172 from TehWebby/patch-3 
Fix typo
 2017-11-28 18:40:02 +01:00
Salvatore Sanfilippo
4f5a9c99f8 Merge pull request #4172 from TehWebby/patch-3 
Fix typo
 2017-11-28 18:40:02 +01:00
Salvatore Sanfilippo
0679f760ff Merge pull request #4176 from KrauseFx/patch-1 
Update link to https and use inline link
 2017-11-28 18:39:43 +01:00
Salvatore Sanfilippo
ad171f5ce0
Merge pull request #4176 from KrauseFx/patch-1 
Update link to https and use inline link
 2017-11-28 18:39:43 +01:00
Salvatore Sanfilippo
742d555754 Merge pull request #4176 from KrauseFx/patch-1 
Update link to https and use inline link
 2017-11-28 18:39:43 +01:00
antirez
6d91878a23 t_hash.c: clarify calling two times the same function. 2017-11-28 18:39:00 +01:00
antirez
851e9fc48b t_hash.c: clarify calling two times the same function. 2017-11-28 18:39:00 +01:00
antirez
ff2b31e9a3 t_hash.c: clarify calling two times the same function. 2017-11-28 18:39:00 +01:00
antirez
38adb13962 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2017-11-28 18:27:35 +01:00
antirez
aeee039a87 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2017-11-28 18:27:35 +01:00
antirez
788710fa44 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2017-11-28 18:27:35 +01:00
antirez
8862e64771 adlist: fix listJoin() in the case the second list is empty. 
See #4192, the original PR removed lines of code that are actually
needed, so thanks to @chunqiulfq for reporting the problem, but merging
solution from @jeesyn after checking, together with @artix75, that the
logic covers all the cases.
 2017-11-28 18:25:14 +01:00
antirez
c44732ac58 adlist: fix listJoin() in the case the second list is empty. 
See #4192, the original PR removed lines of code that are actually
needed, so thanks to @chunqiulfq for reporting the problem, but merging
solution from @jeesyn after checking, together with @artix75, that the
logic covers all the cases.
 2017-11-28 18:25:14 +01:00
antirez
0cd79860ec adlist: fix listJoin() in the case the second list is empty. 
See #4192, the original PR removed lines of code that are actually
needed, so thanks to @chunqiulfq for reporting the problem, but merging
solution from @jeesyn after checking, together with @artix75, that the
logic covers all the cases.
 2017-11-28 18:25:14 +01:00
Salvatore Sanfilippo
2afb6b3b5b Merge pull request #4215 from lamby/correct-faield-spelling 
Correct spelling of "faield".
 2017-11-28 18:08:32 +01:00
Salvatore Sanfilippo
c3806f5b72
Merge pull request #4215 from lamby/correct-faield-spelling 
Correct spelling of "faield".
 2017-11-28 18:08:32 +01:00
Salvatore Sanfilippo
7bb1fe976b Merge pull request #4215 from lamby/correct-faield-spelling 
Correct spelling of "faield".
 2017-11-28 18:08:32 +01:00
Salvatore Sanfilippo
534c013ae9 Merge pull request #4374 from rouzier/patch-1 
Fix file descriptor leak and error handling
 2017-11-28 17:33:23 +01:00
Salvatore Sanfilippo
a13106e001
Merge pull request #4374 from rouzier/patch-1 
Fix file descriptor leak and error handling
 2017-11-28 17:33:23 +01:00
Salvatore Sanfilippo
355ba680e6 Merge pull request #4374 from rouzier/patch-1 
Fix file descriptor leak and error handling
 2017-11-28 17:33:23 +01:00
Salvatore Sanfilippo
51695bb3f8 Merge pull request #4451 from devnexen/minor_build_fixes 
Fix undefined behavior constant defined.
 2017-11-28 17:23:48 +01:00