summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* AnetFormatIP(): renamed, commented, now sticks to IP:port format.antirez2014-12-116-14/+15
* Cleanup all IP formatting codeMatt Stancliff2014-12-115-33/+12
* Add centralized IP/Peer formatting functionsMatt Stancliff2014-12-114-0/+37
* SORT: Don't sort Set elements if not needed.antirez2014-12-111-1/+3
* Merge pull request #2094 from mattsta/nosortSalvatore Sanfilippo2014-12-111-9/+6
|\
| * Fix zero-ordering SORT when called against listsMatt Stancliff2014-10-291-9/+6
* | In redisIsSupervised() use MSG_NOSIGNAL only for Linux.antirez2014-12-112-2/+11
* | Removed useless space in redis-benchmark.c.antirez2014-12-111-1/+1
* | Merge pull request #2105 from Hailei/fix-redis-benchmark-idle-IDLESalvatore Sanfilippo2014-12-111-3/+8
|\ \
| * | FIXED redis-benchmark's idle mode.With idle mode shouldn't create write eventzhanghailei2014-10-271-3/+8
* | | Merge pull request #2106 from NanXiao/unstableSalvatore Sanfilippo2014-12-111-2/+2
|\ \ \
| * | | Fix function prototype in redis-cli.c.Nan Xiao2014-10-271-2/+2
| |/ /
* | | Merge pull request #2107 from mattsta/fix-trib-importSalvatore Sanfilippo2014-12-111-1/+1
|\ \ \
| * | | Fix redis-trib import SCAN callMatt Stancliff2014-10-291-1/+1
| | |/ | |/|
* | | Merge pull request #2114 from h0x91b/redis-cli-fix-clusterSalvatore Sanfilippo2014-12-111-24/+32
|\ \ \
| * | | Reconnect redis-cli when cluster return "moved"h0x91b2014-10-301-24/+32
* | | | Merge pull request #2134 from pyr/feature/supervised-initSalvatore Sanfilippo2014-12-113-3/+72
|\ \ \ \
| * | | | Do not expect UPSTART_JOB to be redisPierre-Yves Ritschard2014-12-101-3/+0
| * | | | Support daemon supervision by upstart or systemdPierre-Yves Ritschard2014-11-113-3/+75
* | | | | Better read-only behavior for expired keys in slaves.antirez2014-12-105-7/+32
* | | | | Merge pull request #2133 from chooper/histfile-overrideSalvatore Sanfilippo2014-12-101-4/+29
|\ \ \ \ \
| * | | | | override histfile from env - fixes #831 and copies #833Charles Hooper2014-11-101-4/+29
| |/ / / /
* | | | | Sentinel: INFO-CACHE comments reworked a bit.antirez2014-12-101-10/+12
* | | | | Sentinel: INFO-CACHE GCC minior code cleanup.antirez2014-12-101-4/+2
* | | | | Sentinel: removed useless flag var from INFO-CACHE.antirez2014-12-101-3/+1
* | | | | Sentinel: INFO-CACHE reply format command shortened.antirez2014-12-101-7/+3
* | | | | Merge pull request #2148 from mattsta/feature/sentinel/info-cacheSalvatore Sanfilippo2014-12-101-0/+69
|\ \ \ \ \
| * | | | | Add SENTINEL INFO-CACHE [masters...]Matt Stancliff2014-11-201-0/+69
* | | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2014-12-101-1/+1
|\ \ \ \ \ \
| * | | | | | Update sds.cBrochen2014-12-101-1/+1
* | | | | | | test-sds target in Makefile to run sds.c tests.antirez2014-12-101-0/+4
* | | | | | | sds.c: more tests for sdstrim().antirez2014-12-101-0/+12
|/ / / / / /
* | | | | | Merge pull request #2165 from sunheehnus/zipmap-readSalvatore Sanfilippo2014-12-091-3/+2
|\ \ \ \ \ \
| * | | | | | zipmap.c: update comments aboveSun He2014-11-251-3/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2176 from deepakverma/redis_bench_authfixSalvatore Sanfilippo2014-12-091-28/+30
|\ \ \ \ \ \
| * | | | | | replaced // comments #2150Deepak Verma2014-12-011-2/+2
| * | | | | | redis-benchmark AUTH command to be discarded after the first send #2150azure provisioned user2014-12-011-28/+30
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2119 from sunheehnus/unstableSalvatore Sanfilippo2014-12-091-6/+6
|\ \ \ \ \ \
| * | | | | | sds.c: Correct two spelling mistakes in commentsSun He2014-11-031-2/+2
| * | | | | | sds.c/sdscatvprintf: set va_end to finish va_list cpySun He2014-11-021-1/+1
| * | | | | | sds.c: Correct some commentsSun He2014-11-021-4/+4
| | |/ / / / | |/| | | |
* | | | | | Include stropts only if __sun is defined.antirez2014-12-091-0/+2
* | | | | | Merge pull request #2177 from badboy/solaris-ioctl-warn-fixSalvatore Sanfilippo2014-12-091-0/+1
|\ \ \ \ \ \
| * | | | | | Fix implicit declaration of ioctl on SolarisJan-Erik Rediger2014-12-011-0/+1
* | | | | | | Merge pull request #2179 from sunheehnus/bitops-readSalvatore Sanfilippo2014-12-091-9/+21
|\ \ \ \ \ \ \
| * | | | | | | bitops.c/bitopCommand: skip short minlen for FAST PATHSun He2014-12-031-1/+1
| * | | | | | | bitops.c/redisPopcount: little optimization in loopSun He2014-12-021-8/+20
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2189 from jbergstroem/glibc_220_default_warnSalvatore Sanfilippo2014-12-091-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Silence _BSD_SOURCE warnings in glibc 2.20 and forwardJohan Bergström2014-12-051-0/+1
* | | | | | | | Merge pull request #2197 from sunheehnus/sparklineSalvatore Sanfilippo2014-12-092-4/+3
|\ \ \ \ \ \ \ \
View Lorry Controller Status