summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5248 from soloestoy/rewrite-brpoplpushSalvatore Sanfilippo2018-08-264-3/+7
|\
| * block: format codezhaozhao.zz2018-08-141-2/+2
| * block: rewrite BRPOPLPUSH as RPOPLPUSH to propagatezhaozhao.zz2018-08-143-1/+5
* | Merge pull request #5244 from soloestoy/optimize-pipelineSalvatore Sanfilippo2018-08-262-53/+55
|\ \
| * | networking: make setProtocolError simple and clearzhaozhao.zz2018-08-231-13/+11
| * | networking: just move qb_pos instead of sdsrange in processInlineBufferzhaozhao.zz2018-08-141-3/+2
| * | networking: just return C_OK if multibulk processing saw a <= 0 length.zhaozhao.zz2018-08-141-5/+2
| * | pipeline: do not sdsrange querybuf unless all commands processedzhaozhao.zz2018-08-142-40/+48
| |/
* | Merge pull request #2992 from lamby/source-date-epochSalvatore Sanfilippo2018-08-261-0/+3
|\ \
| * | Use SOURCE_DATE_EPOCH over unreproducible uname + date calls.Chris Lamb2016-04-291-0/+3
* | | Merge branch 'unstable' into config-set-maxmemory-grammarChris Lamb2018-08-25115-13065/+43236
|\ \ \ | | |/ | |/|
| * | Merge pull request #5146 from 0xtonyxia/fix-xclaim-id-parseSalvatore Sanfilippo2018-08-031-1/+1
| |\ \
| | * | Streams: ID of xclaim command starts from the sixth argument.dejun.xdj2018-07-191-1/+1
| * | | Merge pull request #5151 from shenlongxing/fix-streamSalvatore Sanfilippo2018-08-032-7/+7
| |\ \ \
| | * | | Fix stream command parasshenlongxing2018-08-032-7/+7
| * | | | Fix AOF comment to report the current behavior.antirez2018-08-031-1/+3
| * | | | Fix zslUpdateScore() edge case.antirez2018-08-011-2/+2
| * | | | More commenting of zslUpdateScore().antirez2018-08-011-0/+2
| * | | | Explain what's the point of zslUpdateScore() in top comment.antirez2018-08-011-0/+5
| * | | | Remove old commented zslUpdateScore() from source.antirez2018-08-011-13/+0
| * | | | Optimize zslUpdateScore() as asked in #5179.antirez2018-08-011-0/+44
| * | | | zsetAdd() refactored adding zslUpdateScore().antirez2018-08-011-7/+18
| |/ / /
| * | | Streams IDs parsing refactoring.antirez2018-07-311-17/+32
| * | | Merge pull request #5184 from 0xtonyxia/streams-id-optSalvatore Sanfilippo2018-07-311-15/+19
| |\ \ \
| | * | | Streams: rearrange the usage of '-' and '+' IDs in stream commands.dejun.xdj2018-07-301-13/+13
| | * | | Streams: add mmid_supp argument in streamParseIDOrReply().dejun.xdj2018-07-301-2/+6
| * | | | Merge pull request #5187 from oranagra/testsuite_improvementsSalvatore Sanfilippo2018-07-311-0/+4
| |\ \ \ \
| | * | | | add DEBUG LOG, to to assist test suite debuggingOran Agra2018-07-301-0/+4
| * | | | | Cluster cron announce IP minor refactoring.antirez2018-07-311-3/+6
| * | | | | Merge pull request #5191 from shenlongxing/fix-memory-leakSalvatore Sanfilippo2018-07-311-2/+3
| |\ \ \ \ \
| | * | | | | Fix cluster-announce-ip memory leakshenlongxing2018-07-311-2/+3
| | | |/ / / | | |/| | |
| * | | | | Tranfer -> transfer typo fixed.antirez2018-07-311-1/+1
| * | | | | Merge pull request #5189 from soloestoy/refactor-dbOverwriteSalvatore Sanfilippo2018-07-314-12/+27
| |\ \ \ \ \
| | * | | | | refactor dbOverwrite to make lazyfree workzhaozhao.zz2018-07-314-12/+27
| | |/ / / /
| * | | | | Refactoring: replace low-level checks with writeCommandsDeniedByDiskError().antirez2018-07-312-13/+6
| * | | | | Fix writeCommandsDeniedByDiskError() inverted return value.antirez2018-07-311-2/+2
| * | | | | Better top comment for writeCommandsDeniedByDiskError().antirez2018-07-311-1/+8
| * | | | | Introduce writeCommandsDeniedByDiskError().antirez2018-07-312-0/+24
| * | | | | Merge pull request #5153 from trevor211/fixLuaScriptSalvatore Sanfilippo2018-07-301-4/+14
| |\ \ \ \ \
| | * | | | | Consider aof write error as well as rdb in lua script.WuYunlong2018-07-211-4/+14
| | | |_|/ / | | |/| | |
| * | | | | INFO CPU: higher precision of reported valuesPavel Rochnyack2018-07-301-8/+8
| * | | | | Merge pull request #5183 from gkorland/patch-1Salvatore Sanfilippo2018-07-301-13/+13
| |\ \ \ \ \
| | * | | | | Few typo fixesGuy Korland2018-07-301-13/+13
| * | | | | | Add year in log.antirez2018-07-301-1/+1
| |/ / / / /
| * | | | | Make dynamic hz actually configurable.antirez2018-07-301-0/+9
| * | | | | Control dynamic HZ via server configuration.antirez2018-07-302-6/+13
| * | | | | Merge branch 'dynamic-hz' into unstableantirez2018-07-303-14/+32
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Dynamic HZ: adapt cron frequency to number of clients.dynamic-hzantirez2018-07-232-5/+17
| | * | | | Dynamic HZ: separate hz from the configured hz.antirez2018-07-233-9/+15
| * | | | | Remove useless conditional from emptyDb().antirez2018-07-251-1/+0