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

27273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antirez
888f609b3d Merge branch 'unstable' of github.com:/antirez/redis into unstable 2016-05-05 17:39:40 +02:00
antirez
bdbeb07a9e Merge branch 'unstable' of github.com:/antirez/redis into unstable 2016-05-05 17:39:40 +02:00
antirez
f36bf76a15 Revert "Fix commandCommand arity" 
This reverts commit 1189a4eae6d009fc0da8d50fd542ba1391542165.

Actually this is wrong, the command can be called without args at all.
 2016-05-05 17:36:05 +02:00
antirez
68dd1c9155 Revert "Fix commandCommand arity" 
This reverts commit 1189a4eae6d009fc0da8d50fd542ba1391542165.

Actually this is wrong, the command can be called without args at all.
 2016-05-05 17:36:05 +02:00
Salvatore Sanfilippo
1907d9b6f5 Merge pull request #2956 from pkulchenko/global-protection-msg-typo 
Update global protection error message
 2016-05-05 17:26:35 +02:00
Salvatore Sanfilippo
f0fcc36ce1 Merge pull request #2956 from pkulchenko/global-protection-msg-typo 
Update global protection error message
 2016-05-05 17:26:35 +02:00
Ruben Bridgewater
4ce1125d32 Fix commandCommand arity 2016-05-05 17:20:14 +02:00
Ruben Bridgewater
efa0840707 Fix commandCommand arity 2016-05-05 17:20:14 +02:00
Salvatore Sanfilippo
0b328e14c4 Merge pull request #2998 from danielhtshih/unstable 
Fix a possible race condition of sdown event detection if sentinel's connection to master/slave/sentinel became disconnected just after the last PONG and before the next PING.
 2016-05-05 17:16:58 +02:00
Salvatore Sanfilippo
f5ff91f675 Merge pull request #2998 from danielhtshih/unstable 
Fix a possible race condition of sdown event detection if sentinel's connection to master/slave/sentinel became disconnected just after the last PONG and before the next PING.
 2016-05-05 17:16:58 +02:00
Salvatore Sanfilippo
a75b9659c5 Merge pull request #3006 from baishaofei/unstable 
fix linux compile Error zmalloc.c:109: error: invalid lvalue in unary `&'
 2016-05-05 16:23:47 +02:00
Salvatore Sanfilippo
0c1f84f0ea Merge pull request #3006 from baishaofei/unstable 
fix linux compile Error zmalloc.c:109: error: invalid lvalue in unary `&'
 2016-05-05 16:23:47 +02:00
Salvatore Sanfilippo
4a33213cdb Merge pull request #3008 from badboy/fix-2911 
Fix nanosecond conversion
 2016-05-05 16:21:21 +02:00
Salvatore Sanfilippo
7b90815fc3 Merge pull request #3008 from badboy/fix-2911 
Fix nanosecond conversion
 2016-05-05 16:21:21 +02:00
antirez
4fe2256ca3 redis-cli: don't free historyfile, is used later. 2016-05-05 13:58:06 +02:00
antirez
02db338a82 redis-cli: don't free historyfile, is used later. 2016-05-05 13:58:06 +02:00
antirez
c741cae38c Cluster test 12: reshard back just a few slots to speedup the test. 2016-05-05 11:57:49 +02:00
antirez
4c53bab17b Cluster test 12: reshard back just a few slots to speedup the test. 2016-05-05 11:57:49 +02:00
antirez
f292056f5d Cluster: make getNodeByQuery() responsible of -CLUSTERDOWN errors. 
This fixes a bug introduced by bb51ad0, and makes the code consistent
with the logic of always allowing, while the cluster is down, commands
that don't target any key.

As a side effect the code is also simpler now.
 2016-05-05 11:33:43 +02:00
antirez
971e3c51b6 Cluster: make getNodeByQuery() responsible of -CLUSTERDOWN errors. 
This fixes a bug introduced by d827dbf, and makes the code consistent
with the logic of always allowing, while the cluster is down, commands
that don't target any key.

As a side effect the code is also simpler now.
 2016-05-05 11:33:43 +02:00
Salvatore Sanfilippo
06cf94b7af Merge pull request #3039 from itamarhaber/patch-3 
Fixes a typo in the comments
 2016-05-05 10:15:17 +02:00
Salvatore Sanfilippo
330715afd8 Merge pull request #3039 from itamarhaber/patch-3 
Fixes a typo in the comments
 2016-05-05 10:15:17 +02:00
Salvatore Sanfilippo
96b8e2868a Merge pull request #3077 from Palethorn/ipv6-redirect-parse 
Fix for #3076 Reverse redirect address parse
 2016-05-05 10:13:00 +02:00
Salvatore Sanfilippo
a4df156872 Merge pull request #3077 from Palethorn/ipv6-redirect-parse 
Fix for #3076 Reverse redirect address parse
 2016-05-05 10:13:00 +02:00
antirez
a17f4ca56c Bind both IPv4 and IPv6 or exit with an error by default. 
Thanks to @tushar2708 for the PR. I applied a slightly different fix.
Thanks to @cespare for reporting.

Close #3024
Close #3020
 2016-05-05 10:02:42 +02:00
antirez
c77b95fd01 Bind both IPv4 and IPv6 or exit with an error by default. 
Thanks to @tushar2708 for the PR. I applied a slightly different fix.
Thanks to @cespare for reporting.

Close #3024
Close #3020
 2016-05-05 10:02:42 +02:00
antirez
10381ae169 Quick fix to avoid false positive in replica migration test. 2016-05-05 09:45:31 +02:00
antirez
0bb787d3ad Quick fix to avoid false positive in replica migration test. 2016-05-05 09:45:31 +02:00
Chris Thunes
bb51ad0e97 Ensure slots are rechecked on EXEC. 
Fixes #2515.
 2016-05-05 09:35:20 +02:00
Chris Thunes
d827dbfda7 Ensure slots are rechecked on EXEC. 
Fixes #2515.
 2016-05-05 09:35:20 +02:00
Salvatore Sanfilippo
3cf68cb168 Merge pull request #3188 from therealbill/unstable 
maxmemory_policy fix for #3187
 2016-05-05 09:02:25 +02:00
Salvatore Sanfilippo
91b4966783 Merge pull request #3188 from therealbill/unstable 
maxmemory_policy fix for #3187
 2016-05-05 09:02:25 +02:00
Salvatore Sanfilippo
f734e73cbd Merge pull request #3193 from sethbergman/patch-1 
Fixed typo in README.md
 2016-05-05 08:57:30 +02:00
Salvatore Sanfilippo
de3a6736f7 Merge pull request #3193 from sethbergman/patch-1 
Fixed typo in README.md
 2016-05-05 08:57:30 +02:00
Salvatore Sanfilippo
47030aacab Merge pull request #3152 from be-hase/fix/check_open_slots 
Fix redis-trib.rb
 2016-05-05 08:56:28 +02:00
Salvatore Sanfilippo
09153b9127 Merge pull request #3152 from be-hase/fix/check_open_slots 
Fix redis-trib.rb
 2016-05-05 08:56:28 +02:00
antirez
25c7c4a198 Added a tool for generating changelogs automatically. 
Sometimes Redis patch releases are released in a matter of weeks or days
one after the other. In order to have less release friction the idea is
to stop writing changelogs by hand, in order to also cover everything
interesting there is to say. Useless things can be deleted manually by
the changelog. Also this gives more credits to contributors since often
in the commit message involved people are cited even when they are not
the authors of the commit.
 2016-05-04 22:41:57 +02:00
antirez
b76d27ca74 Added a tool for generating changelogs automatically. 
Sometimes Redis patch releases are released in a matter of weeks or days
one after the other. In order to have less release friction the idea is
to stop writing changelogs by hand, in order to also cover everything
interesting there is to say. Useless things can be deleted manually by
the changelog. Also this gives more credits to contributors since often
in the commit message involved people are cited even when they are not
the authors of the commit.
 2016-05-04 22:41:57 +02:00
antirez
519f65b51e Minor redis-cli wording change in --help output. 2016-05-04 22:34:26 +02:00
antirez
b632f7846b Minor redis-cli wording change in --help output. 2016-05-04 22:34:26 +02:00
antirez
dd8a3b013e Allow CONFIG GET during loading. 
Thanks to @oranagra for the idea of allowing CONFIG GET during loading.
 2016-05-04 15:45:45 +02:00
antirez
995b9ffe07 Allow CONFIG GET during loading. 
Thanks to @oranagra for the idea of allowing CONFIG GET during loading.
 2016-05-04 15:45:45 +02:00
antirez
99a6bcda1b Command "r" flag removed from commands not accessing the key space. 
Thanks to @oranagra for the hint about misplaced 'r' flags.
 2016-05-04 15:42:33 +02:00
antirez
5500c51083 Command "r" flag removed from commands not accessing the key space. 
Thanks to @oranagra for the hint about misplaced 'r' flags.
 2016-05-04 15:42:33 +02:00
antirez
aa206616b9 DEBUG command self documentation. 2016-05-04 12:45:55 +02:00
antirez
840ac20855 DEBUG command self documentation. 2016-05-04 12:45:55 +02:00
Salvatore Sanfilippo
8f22e65c39 Merge pull request #3191 from oranagra/minor_fix 
Minor fixes found during merge and code review
 2016-05-04 09:11:36 +02:00
Salvatore Sanfilippo
b5352eea51 Merge pull request #3191 from oranagra/minor_fix 
Minor fixes found during merge and code review
 2016-05-04 09:11:36 +02:00
antirez
80887327fd Reply with error on negative geo radius. 
Thanks to @tidwall for reporting.
Close #3194.
 2016-05-04 09:00:32 +02:00
antirez
2c22f59c3f Reply with error on negative geo radius. 
Thanks to @tidwall for reporting.
Close #3194.
 2016-05-04 09:00:32 +02:00