summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Remove implicit and potensially false dependency on jdisc_http_service"Bjørn Christian Seime2020-11-1111-31/+15
* Merge pull request #15292 from vespa-engine/bjorncs/fixJon Marius Venstad2020-11-111-0/+2
|\
| * Install config definitionBjørn Christian Seime2020-11-111-0/+2
|/
* Merge pull request #15289 from vespa-engine/bjorncs/decouple-dependenciesBjørn Christian Seime2020-11-1111-15/+31
|\
| * Remove implicit and potensially false dependency on jdisc_http_serviceBjørn Christian Seime2020-11-1111-15/+31
* | Merge pull request #15287 from vespa-engine/revert-15276-hmusum/hold-applicat...Jon Marius Venstad2020-11-111-20/+6
|\ \ | |/ |/|
| * Revert "Hold application lock when redeploying in bootstrap code"Harald Musum2020-11-111-20/+6
|/
* Merge pull request #15280 from vespa-engine/mpolden/reduce-log-levelMartin Polden2020-11-112-15/+5
|\
| * Avoid exposing ApplicationTransaction lockMartin Polden2020-11-112-9/+3
| * Reduce log levelMartin Polden2020-11-111-6/+2
* | Merge pull request #15285 from vespa-engine/bjorncs/install-clustercontroller...Jon Marius Venstad2020-11-1112-25/+183
|\ \
| * | zookeeper-server-common is not loaded as a bundleBjørn Christian Seime2020-11-111-1/+1
| * | Revert "Merge pull request #15282 from vespa-engine/revert-15274-revert-15272...Bjørn Christian Seime2020-11-1112-25/+183
|/ /
* | Merge pull request #15282 from vespa-engine/revert-15274-revert-15272-revert-...Jon Marius Venstad2020-11-1112-183/+25
|\ \
| * | Revert "Revert "Revert "Bjorncs/install clustercontroller reindexer"""Arnstein Ressem2020-11-1112-183/+25
* | | Merge pull request #15281 from vespa-engine/mpolden/fix-logJon Bratseth2020-11-112-3/+6
|\ \ \ | |/ / |/| |
| * | Log OS version fields of parent hostMartin Polden2020-11-112-3/+6
* | | Merge pull request #15279 from vespa-engine/toregge/remove-igidcompare-interfaceHenning Baldersheim2020-11-1114-144/+22
|\ \ \
| * | | Remove IGidCompare interface.Tor Egge2020-11-1114-144/+22
* | | | Merge pull request #15277 from vespa-engine/hakonhall/fix-thread-lock-detecti...Håkon Hallingstad2020-11-112-7/+8
|\ \ \ \
| * | | | return earlier if possibleHåkon Hallingstad2020-11-111-5/+6
| * | | | Fix thread lock detection bugHåkon Hallingstad2020-11-112-3/+3
* | | | | Merge pull request #15262 from vespa-engine/freva/update-metaValerij Fredriksen2020-11-112-4/+7
|\ \ \ \ \
| * | | | | Fix java heap dump metadataValerij Fredriksen2020-11-102-4/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15275 from vespa-engine/freva/fix-controllerValerij Fredriksen2020-11-111-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use port 19071 insteadValerij Fredriksen2020-11-111-1/+1
* | | | | Merge pull request #15267 from vespa-engine/toregge/avoid-clang-11-warningsArne H Juul2020-11-112-4/+4
|\ \ \ \ \
| * | | | | Avoid clang 11 warnings.Tor Egge2020-11-102-4/+4
* | | | | | Merge pull request #15257 from vespa-engine/arnej/add-java-tensor-conformance...Arne H Juul2020-11-114-0/+237
|\ \ \ \ \ \
| * | | | | | just compute our resultArne Juul2020-11-101-11/+6
| * | | | | | fix copyright, untabifyArne Juul2020-11-101-2/+3
| * | | | | | install binary for vespa-tensor-conformanceArne Juul2020-11-101-0/+1
| * | | | | | add script wrapperArne Juul2020-11-102-0/+80
| * | | | | | add a new Java application for evaluating tensor conformance testsArne Juul2020-11-101-0/+160
* | | | | | | Merge pull request #15268 from vespa-engine/bratseth/unoverridable-variantsJon Bratseth2020-11-1126-108/+278
|\ \ \ \ \ \ \
| * | | | | | | Improve descriptionJon Bratseth2020-11-111-2/+2
| * | | | | | | Update ABI specJon Bratseth2020-11-111-0/+1
| * | | | | | | Support setting specific variants unoverridableJon Bratseth2020-11-1026-108/+277
* | | | | | | | Merge pull request #15276 from vespa-engine/hmusum/hold-application-lock-when...Jon Marius Venstad2020-11-111-6/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Hold application lock when redeploying in bootstrap codeHarald Musum2020-11-111-6/+20
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #15274 from vespa-engine/revert-15272-revert-15264-bjorncs...Jon Marius Venstad2020-11-1112-25/+183
|\ \ \ \ \ \ \ \
| * | | | | | | | Add TODO to clean upJon Marius Venstad2020-11-111-0/+1
| * | | | | | | | Ensure ZK server has started before ReindexingMaintainerBjørn Christian Seime2020-11-113-1/+23
| * | | | | | | | Revert "Revert "Bjorncs/install clustercontroller reindexer" MERGEOK"Bjørn Christian Seime2020-11-1111-26/+161
| |/ / / / / / /
* | | | | | | | Merge pull request #15259 from vespa-engine/vekterli/add-exact-match-x509-uri...Tor Brede Vekterli2020-11-1111-39/+137
|\ \ \ \ \ \ \ \
| * | | | | | | | Add basic exact matching support for X509 URI SANsTor Brede Vekterli2020-11-1011-39/+137
* | | | | | | | | Merge pull request #15273 from vespa-engine/revert-15265-revert-15263-bjorncs...Bjørn Christian Seime2020-11-112-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add clustercontroller-reindexer to Vespa RPMBjørn Christian Seime2020-11-111-0/+1
| * | | | | | | | Revert "Revert "Add clustercontroller-reindexer to root CMakeLists.txt""Bjørn Christian Seime2020-11-111-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #15271 from vespa-engine/revert-15179-bjorncs/attribute-va...Bjørn Christian Seime2020-11-113-5/+71
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |