summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [7.284.21-1].vespa-7.284.21-1sd-buildbot2020-09-104-1/+2
* Merge pull request #14357 from vespa-engine/jonmv/accept-default-port-being-h...Jon Marius Venstad2020-09-092-4/+14
|\
| * Handle default port for http and https being hidden by java URIJon Marius Venstad2020-09-092-4/+14
* | Merge pull request #14352 from vespa-engine/revert-14329-hmusum/remove-deprec...Valerij Fredriksen2020-09-098-3/+166
|\ \
| * | Revert "Remove deprecated methods and unnecessary compatibility code"Jon Marius Venstad2020-09-098-3/+166
* | | Merge pull request #14351 from vespa-engine/revert-14319-revert-14314-revert-...Valerij Fredriksen2020-09-0924-316/+145
|\ \ \ | |/ / |/| |
| * | Revert "Revert "Revert "Balder/group commits to tls 2 remaining rebased"""Jon Marius Venstad2020-09-0924-316/+145
* | | Merge pull request #14350 from vespa-engine/revert-14331-hmusum/add-force-par...Valerij Fredriksen2020-09-097-43/+42
|\ \ \
| * | | Revert "Add force request property to PrepareParams"Jon Marius Venstad2020-09-097-43/+42
* | | | Merge pull request #14349 from vespa-engine/revert-14332-toregge/ignore-summa...Valerij Fredriksen2020-09-092-5/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Ignore summary override if attribute vector is missing."Jon Marius Venstad2020-09-092-5/+2
| |/ /
* | | Merge pull request #14348 from vespa-engine/revert-14336-bratseth/allocation-...Valerij Fredriksen2020-09-0910-112/+32
|\ \ \
| * | | Revert "Bratseth/allocation improvements"Jon Marius Venstad2020-09-0910-112/+32
| |/ /
* | | Merge pull request #14347 from vespa-engine/revert-14338-vekterli/support-id-...Valerij Fredriksen2020-09-094-37/+13
|\ \ \ | |/ / |/| |
| * | Revert "Support 'id' as field name in C++ document selection lexing/parsing"Jon Marius Venstad2020-09-094-37/+13
|/ /
* | Merge pull request #14346 from vespa-engine/revert-14278-bratseth/remove-phra...Valerij Fredriksen2020-09-091-0/+6
|\ \
| * | Revert "Remove phrase-segmenting feature flag"Jon Marius Venstad2020-09-091-0/+6
| |/
* | Merge pull request #14345 from vespa-engine/revert-14342-revert-14319-revert-...Valerij Fredriksen2020-09-0924-145/+316
|\ \ | |/ |/|
| * Revert "Revert "Revert "Revert "Balder/group commits to tls 2 remaining rebas...Jon Marius Venstad2020-09-0924-145/+316
|/
* Merge pull request #14344 from vespa-engine/jonmv/validate-created-uriBjørn Christian Seime2020-09-092-4/+48
|\
| * Validate created URI is as expectedJon Marius Venstad2020-09-092-4/+48
* | Merge pull request #14342 from vespa-engine/revert-14319-revert-14314-revert-...Harald Musum2020-09-0924-316/+145
|\ \
| * | Revert "Revert "Revert "Balder/group commits to tls 2 remaining rebased"""Arnstein Ressem2020-09-0924-316/+145
* | | Merge pull request #14278 from vespa-engine/bratseth/remove-phrase-segmenting...Jon Bratseth2020-09-091-6/+0
|\ \ \ | |/ / |/| |
| * | Remove phrase-segmenting feature flagJon Bratseth2020-09-041-6/+0
* | | Merge pull request #14338 from vespa-engine/vekterli/support-id-as-field-name...Tor Brede Vekterli2020-09-094-13/+37
|\ \ \
| * | | Verify existing semantics of 'id' as field name in Java parserTor Brede Vekterli2020-09-091-2/+8
| * | | Support 'id' as field name in C++ document selection lexing/parsingTor Brede Vekterli2020-09-093-11/+29
* | | | Merge pull request #14336 from vespa-engine/bratseth/allocation-improvementsValerij Fredriksen2020-09-0910-32/+112
|\ \ \ \ | |_|_|/ |/| | |
| * | | SimplifyJon Bratseth2020-09-091-3/+1
| * | | SimplifyJon Bratseth2020-09-091-10/+14
| * | | SimplifyJon Bratseth2020-09-091-11/+13
| * | | Don't change node allocation when we cannot failJon Bratseth2020-09-093-14/+38
| * | | Reuse inactive nodes also when they are retired firstJon Bratseth2020-09-099-14/+66
* | | | Merge pull request #14332 from vespa-engine/toregge/ignore-summary-override-i...Geir Storli2020-09-092-2/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Ignore summary override if attribute vector is missing.Tor Egge2020-09-092-2/+5
* | | | Merge pull request #14331 from vespa-engine/hmusum/add-force-param-to-Prepare...Jon Marius Venstad2020-09-097-42/+43
|\ \ \ \
| * | | | Add force request property to PrepareParamsHarald Musum2020-09-097-42/+43
| |/ / /
* | | | Merge pull request #14319 from vespa-engine/revert-14314-revert-14304-balder/...Henning Baldersheim2020-09-0924-145/+316
|\ \ \ \ | |_|/ / |/| | |
| * | | Use 4 ms as max time between TLS commit operations.Henning Baldersheim2020-09-091-1/+1
| * | | Use a thread that can schedule with higher frequency than the max frequency o...Henning Baldersheim2020-09-094-36/+33
| * | | Add debug logging.Henning Baldersheim2020-09-092-0/+4
| * | | Revert "Revert "Balder/group commits to tls 2 remaining rebased""Henning Baldersheim2020-09-0824-144/+314
* | | | Merge pull request #14330 from vespa-engine/revert-14308-hmusum/refactor-Remo...Arnstein Ressem2020-09-0915-404/+415
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert " Move code from RemoteSession to SessionRepository, take 2"Harald Musum2020-09-0915-404/+415
|/ / /
* | | Merge pull request #14329 from vespa-engine/hmusum/remove-deprecated-code-and...Harald Musum2020-09-098-166/+3
|\ \ \
| * | | Add back flavor(), used by config-model (and remove usage)Harald Musum2020-09-092-6/+6
| * | | Remove deprecated methods and unnecessary compatibility codeHarald Musum2020-09-097-165/+2
|/ / /
* | | Merge pull request #14308 from vespa-engine/hmusum/refactor-RemoteSession-take-2Harald Musum2020-09-0915-415/+404
|\ \ \
| * | | Remove stray filesHarald Musum2020-09-084-101/+0