Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add centralized IP/Peer formatting functions | Matt Stancliff | 2014-12-11 | 4 | -0/+37 |
* | SORT: Don't sort Set elements if not needed. | antirez | 2014-12-11 | 1 | -1/+3 |
* | Merge pull request #2094 from mattsta/nosort | Salvatore Sanfilippo | 2014-12-11 | 2 | -9/+24 |
|\ | |||||
| * | Fix zero-ordering SORT when called against lists | Matt Stancliff | 2014-10-29 | 2 | -9/+24 |
* | | Merge pull request #2103 from coderholic/unstable | Salvatore Sanfilippo | 2014-12-11 | 1 | -2/+3 |
|\ \ | |||||
| * | | Update redis_init_script.tpl | Ben Dowling | 2014-10-26 | 1 | -2/+3 |
* | | | In redisIsSupervised() use MSG_NOSIGNAL only for Linux. | antirez | 2014-12-11 | 2 | -2/+11 |
* | | | Removed useless space in redis-benchmark.c. | antirez | 2014-12-11 | 1 | -1/+1 |
* | | | Merge pull request #2105 from Hailei/fix-redis-benchmark-idle-IDLE | Salvatore Sanfilippo | 2014-12-11 | 1 | -3/+8 |
|\ \ \ | |||||
| * | | | FIXED redis-benchmark's idle mode.With idle mode shouldn't create write event | zhanghailei | 2014-10-27 | 1 | -3/+8 |
| |/ / | |||||
* | | | Merge pull request #2106 from NanXiao/unstable | Salvatore Sanfilippo | 2014-12-11 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix function prototype in redis-cli.c. | Nan Xiao | 2014-10-27 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #2107 from mattsta/fix-trib-import | Salvatore Sanfilippo | 2014-12-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix redis-trib import SCAN call | Matt Stancliff | 2014-10-29 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #2114 from h0x91b/redis-cli-fix-cluster | Salvatore Sanfilippo | 2014-12-11 | 1 | -24/+32 |
|\ \ \ | |||||
| * | | | Reconnect redis-cli when cluster return "moved" | h0x91b | 2014-10-30 | 1 | -24/+32 |
* | | | | Merge pull request #2117 from mariano-perez-rodriguez/patch-4 | Salvatore Sanfilippo | 2014-12-11 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Typo fixes in redis.conf | Mariano Pérez Rodríguez | 2014-10-31 | 1 | -2/+2 |
* | | | | | Merge pull request #2134 from pyr/feature/supervised-init | Salvatore Sanfilippo | 2014-12-11 | 3 | -3/+72 |
|\ \ \ \ \ | |||||
| * | | | | | Do not expect UPSTART_JOB to be redis | Pierre-Yves Ritschard | 2014-12-10 | 1 | -3/+0 |
| * | | | | | Support daemon supervision by upstart or systemd | Pierre-Yves Ritschard | 2014-11-11 | 3 | -3/+75 |
| |/ / / / | |||||
* | | | | | Better read-only behavior for expired keys in slaves. | antirez | 2014-12-10 | 5 | -7/+32 |
* | | | | | Merge pull request #2133 from chooper/histfile-override | Salvatore Sanfilippo | 2014-12-10 | 1 | -4/+29 |
|\ \ \ \ \ | |||||
| * | | | | | override histfile from env - fixes #831 and copies #833 | Charles Hooper | 2014-11-10 | 1 | -4/+29 |
| |/ / / / | |||||
* | | | | | Sentinel: INFO-CACHE comments reworked a bit. | antirez | 2014-12-10 | 1 | -10/+12 |
* | | | | | Sentinel: INFO-CACHE GCC minior code cleanup. | antirez | 2014-12-10 | 1 | -4/+2 |
* | | | | | Sentinel: removed useless flag var from INFO-CACHE. | antirez | 2014-12-10 | 1 | -3/+1 |
* | | | | | Sentinel: INFO-CACHE reply format command shortened. | antirez | 2014-12-10 | 1 | -7/+3 |
* | | | | | Merge pull request #2148 from mattsta/feature/sentinel/info-cache | Salvatore Sanfilippo | 2014-12-10 | 1 | -0/+69 |
|\ \ \ \ \ | |||||
| * | | | | | Add SENTINEL INFO-CACHE [masters...] | Matt Stancliff | 2014-11-20 | 1 | -0/+69 |
* | | | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstable | antirez | 2014-12-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #2203 from Brochen/unstable | Salvatore Sanfilippo | 2014-12-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Update sds.c | Brochen | 2014-12-10 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | test-sds target in Makefile to run sds.c tests. | antirez | 2014-12-10 | 1 | -0/+4 |
* | | | | | | | sds.c: more tests for sdstrim(). | antirez | 2014-12-10 | 1 | -0/+12 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2165 from sunheehnus/zipmap-read | Salvatore Sanfilippo | 2014-12-09 | 1 | -3/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | zipmap.c: update comments above | Sun He | 2014-11-25 | 1 | -3/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #2176 from deepakverma/redis_bench_authfix | Salvatore Sanfilippo | 2014-12-09 | 1 | -28/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | replaced // comments #2150 | Deepak Verma | 2014-12-01 | 1 | -2/+2 |
| * | | | | | | redis-benchmark AUTH command to be discarded after the first send #2150 | azure provisioned user | 2014-12-01 | 1 | -28/+30 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #2119 from sunheehnus/unstable | Salvatore Sanfilippo | 2014-12-09 | 1 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sds.c: Correct two spelling mistakes in comments | Sun He | 2014-11-03 | 1 | -2/+2 |
| * | | | | | | sds.c/sdscatvprintf: set va_end to finish va_list cpy | Sun He | 2014-11-02 | 1 | -1/+1 |
| * | | | | | | sds.c: Correct some comments | Sun He | 2014-11-02 | 1 | -4/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Include stropts only if __sun is defined. | antirez | 2014-12-09 | 1 | -0/+2 |
* | | | | | | Merge pull request #2177 from badboy/solaris-ioctl-warn-fix | Salvatore Sanfilippo | 2014-12-09 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix implicit declaration of ioctl on Solaris | Jan-Erik Rediger | 2014-12-01 | 1 | -0/+1 |
* | | | | | | | Merge pull request #2179 from sunheehnus/bitops-read | Salvatore Sanfilippo | 2014-12-09 | 1 | -9/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bitops.c/bitopCommand: skip short minlen for FAST PATH | Sun He | 2014-12-03 | 1 | -1/+1 |
| * | | | | | | | bitops.c/redisPopcount: little optimization in loop | Sun He | 2014-12-02 | 1 | -8/+20 |
| | |/ / / / / | |/| | | | | |