summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.192.4-1].vespa-6.192.4-1vespa-6.192.4by-screwdriver2018-01-044-1/+2
* Merge pull request #4536 from vespa-engine/revert-4534-revert-4533-revert-445...Harald Musum2018-01-0246-218/+120
|\
| * Revert "Revert "Revert "Jvenstad/zone cleanup 4"""Harald Musum2018-01-0246-218/+120
|/
* Merge pull request #4531 from vespa-engine/revert-4521-revert-4516-hakonhall/...Håkon Hallingstad2018-01-027-86/+231
|\
| * Call start once and avoid stop without startHåkon Hallingstad2018-01-021-7/+10
| * Revert "Revert "Support node admin modes""Håkon Hallingstad2018-01-027-86/+228
* | Merge pull request #4534 from vespa-engine/revert-4533-revert-4453-jvenstad/z...Jon Marius Venstad2018-01-0246-120/+218
|\ \
| * | Revert "Revert "Jvenstad/zone cleanup 4""Jon Marius Venstad2018-01-0246-120/+218
|/ /
* | Merge pull request #4533 from vespa-engine/revert-4453-jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-0246-218/+120
|\ \
| * | Revert "Jvenstad/zone cleanup 4"Jon Marius Venstad2018-01-0246-218/+120
|/ /
* | Merge pull request #4453 from vespa-engine/jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-0246-120/+218
|\ \ | |/ |/|
| * Merge branch 'master' into jvenstad/zone-cleanup-4Jon Marius Venstad2018-01-02316-2023/+9650
| |\ | |/ |/|
* | Merge pull request #4530 from vespa-engine/hmusum/delete-temp-file-if-move-failsHenning Baldersheim2018-01-011-1/+4
|\ \
| * | Delete temp file if move fails because file already existsHarald Musum2018-01-011-1/+4
|/ /
* | Merge pull request #4529 from vespa-engine/balder/inline-frequently-called-me...Henning Baldersheim2017-12-2915-37/+40
|\ \
| * | Let implementation be visible too.Henning Baldersheim2017-12-295-3/+6
| * | Must see implementation too.Henning Baldersheim2017-12-292-0/+2
| * | Include implementation file too.Henning Baldersheim2017-12-291-4/+3
| * | InlineHenning Baldersheim2017-12-292-8/+3
| * | Ensure methods are inlined.Henning Baldersheim2017-12-293-9/+7
| * | Also copy the zero termination.Henning Baldersheim2017-12-291-1/+1
| * | Avoid all the plt indirections by declaring dll local and using simpler struc...Henning Baldersheim2017-12-294-14/+20
|/ /
* | Merge pull request #4526 from vespa-engine/balder/use-faster-iterationHenning Baldersheim2017-12-2912-76/+71
|\ \
| * | Do not include the world by default.Henning Baldersheim2017-12-287-6/+8
| * | Expect the happy path.Henning Baldersheim2017-12-281-4/+4
| * | Cancel unintended change.Henning Baldersheim2017-12-281-1/+1
| * | Must generate the hash before the object is invalidHenning Baldersheim2017-12-281-1/+2
| * | Make constructor explicit.Henning Baldersheim2017-12-282-3/+2
| * | Use a faster and simpler iteration for speed and simplicity.Henning Baldersheim2017-12-284-64/+57
* | | Merge pull request #4527 from vespa-engine/balder/avoid-parts-of-the-world-onlyHenning Baldersheim2017-12-2929-201/+122
|\ \ \
| * | | Do not include the world.Henning Baldersheim2017-12-2929-201/+122
| |/ /
* | | Merge pull request #4528 from vespa-engine/hmusum/delete-file-if-writing-failsHenning Baldersheim2017-12-291-1/+2
|\ \ \ | |/ / |/| |
| * | Delete inprogress file if write is not successfulHarald Musum2017-12-291-1/+2
* | | Merge pull request #4525 from vespa-engine/arnej/use-context-from-configserve...Harald Musum2017-12-2831-121/+131
|\ \ \ | |/ / |/| |
| * | use new LoggingRequestHandler constructorArne Juul2017-12-2731-121/+131
|/ /
* | Merge pull request #4507 from vespa-engine/arnej/add-context-for-request-handlerArne H Juul2017-12-252-0/+36
|\ \
| * | add optional constructor with Context objectArne Juul2017-12-202-0/+36
* | | Merge pull request #4523 from vespa-engine/revert-4522-revert-4518-hakonhall/...Arne H Juul2017-12-233-2/+6
|\ \ \
| * | | remove unnecessary loggingHåkon Hallingstad2017-12-232-2/+0
| * | | Move initial log to right after Vespa logging has been initializedHåkon Hallingstad2017-12-232-1/+4
| * | | Revert "Revert "Log at JDisc process start and stop""Håkon Hallingstad2017-12-231-1/+4
|/ / /
* | | Merge pull request #4522 from vespa-engine/revert-4518-hakonhall/log-at-jdisc...Arne H Juul2017-12-231-4/+1
|\ \ \
| * | | Revert "Log at JDisc process start and stop"Arne H Juul2017-12-231-4/+1
|/ / /
* | | Merge pull request #4518 from vespa-engine/hakonhall/log-at-jdisc-process-sta...Håkon Hallingstad2017-12-231-1/+4
|\ \ \
| * | | Log at JDisc process start and stopHåkon Hallingstad2017-12-221-1/+4
* | | | Merge pull request #4521 from vespa-engine/revert-4516-hakonhall/support-node...Håkon Hallingstad2017-12-227-228/+86
|\ \ \ \
| * | | | Revert "Support node admin modes"Håkon Hallingstad2017-12-227-228/+86
|/ / / /
* | | | Merge pull request #4520 from vespa-engine/revert-4517-hakonhall/only-start-n...Håkon Hallingstad2017-12-221-0/+1
|\ \ \ \
| * | | | Revert "only start node admin once"Håkon Hallingstad2017-12-221-0/+1
|/ / / /
* | | | Merge pull request #4517 from vespa-engine/hakonhall/only-start-node-admin-onceHåkon Hallingstad2017-12-221-1/+0
|\ \ \ \ | |/ / / |/| | |