summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use proper singleton for default crypto engineHåvard Pettersen2019-05-272-16/+11
* Merge pull request #9550 from vespa-engine/bjorncs/jrtBjørn Christian Seime2019-05-271-48/+2
|\
| * fixup! Remove deprecated Method constructorBjørn Christian Seime2019-05-271-1/+1
| * Remove deprecated Method constructorBjørn Christian Seime2019-05-241-48/+2
* | Merge pull request #9560 from vespa-engine/bratseth/validatiation-override-lo...Jon Bratseth2019-05-273-3/+29
|\ \
| * | Log validation override deactivation to deploy logJon Bratseth2019-05-273-3/+29
|/ /
* | Merge pull request #9559 from vespa-engine/bratseth/dont-modify-bare-metal-al...Jon Bratseth2019-05-272-10/+18
|\ \
| * | Don't modify bare metal allocationsJon Bratseth2019-05-272-10/+18
|/ /
* | Merge pull request #9548 from vespa-engine/toregge/refactor-term-field-match-...Geir Storli2019-05-277-29/+87
|\ \
| * | Refactor tagging of TermFieldMatchData regarding which features areTor Egge2019-05-247-29/+87
* | | Merge pull request #9558 from vespa-engine/bratseth/relax-node-resources-in-devJon Bratseth2019-05-275-10/+38
|\ \ \
| * | | Relax node resources in devJon Bratseth2019-05-275-10/+38
|/ / /
* | | Merge pull request #9520 from vespa-engine/bratseth/uri-in-yqlJon Bratseth2019-05-2626-101/+442
|\ \ \
| * | | Support URI matching in YQLJon Bratseth2019-05-2326-101/+442
* | | | Merge pull request #9551 from vespa-engine/freva/add-cpu.vpus-to-systemmetricsJon Bratseth2019-05-261-0/+2
|\ \ \ \
| * | | | Add cpu.vcpus to SystemMetricsValerij Fredriksen2019-05-241-0/+2
* | | | | Merge pull request #9557 from vespa-engine/freva/fix-metricJon Bratseth2019-05-262-2/+2
|\ \ \ \ \
| * | | | | Report vcpus of the node rather than the hostValerij Fredriksen2019-05-262-2/+2
* | | | | | Merge pull request #9556 from vespa-engine/bratseth/unlimited-cpu-in-devJon Bratseth2019-05-265-22/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Dedicate min vcpu in dev + improved javadocJon Bratseth2019-05-262-9/+10
| * | | | | Merge with masterJon Bratseth2019-05-2641-260/+275
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #9555 from vespa-engine/freva/use-config-provisioning-zone-idHarald Musum2019-05-255-58/+10
|\ \ \ \ \ \
| * | | | | | Use config-provisioning ZoneId in node-adminValerij Fredriksen2019-05-255-58/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #9554 from vespa-engine/hmusum/handle-tenant-type-cloudValerij Fredriksen2019-05-252-4/+5
|\ \ \ \ \ \
| * | | | | | Handle tenant type CLOUDHarald Musum2019-05-252-4/+5
* | | | | | | Merge pull request #9553 from vespa-engine/revert-9547-jvenstad/set-SCREWDRIV...Jon Marius Venstad2019-05-251-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Set environment variable to mimick SD"Harald Musum2019-05-251-1/+0
|/ / / / / /
* | | | | | Merge pull request #9547 from vespa-engine/jvenstad/set-SCREWDRIVER=true-in-evJon Marius Venstad2019-05-241-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Set environment variable to mimick SDJon Marius Venstad2019-05-241-0/+1
* | | | | | Merge pull request #9529 from vespa-engine/bjorncs/jrtBjørn Christian Seime2019-05-2423-170/+133
|\ \ \ \ \ \
| * | | | | | Remove usage of deprecated Method constructorBjørn Christian Seime2019-05-2321-170/+129
| * | | | | | Annotate MethodHandler as functional interfaceBjørn Christian Seime2019-05-231-0/+1
| * | | | | | Deprecate reflection based invocation in jrtBjørn Christian Seime2019-05-231-0/+3
* | | | | | | Merge pull request #9536 from vespa-engine/bratseth/double-api-in-rank-featuresJon Bratseth2019-05-246-16/+67
|\ \ \ \ \ \ \
| * | | | | | | Add double API to RankFeaturesJon Bratseth2019-05-246-16/+67
* | | | | | | | Merge pull request #9545 from vespa-engine/vekterli/bounce-puts-when-node-una...Tor Brede Vekterli2019-05-243-0/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Bounce Puts when a node is unavailable in the pending cluster stateTor Brede Vekterli2019-05-243-0/+41
* | | | | | | | | Merge pull request #9546 from vespa-engine/bratseth/increase-test-timeoutHarald Musum2019-05-242-12/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Increase timeoutJon Bratseth2019-05-242-12/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | | | | | * | Don't limit cpu in devJon Bratseth2019-05-263-5/+3
| | | | | | | * | Don't limit cpu in devJon Bratseth2019-05-241-1/+5
| | | | | | | * | Nonfunctional changes onlyJon Bratseth2019-05-242-16/+23
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #9533 from vespa-engine/mpolden/simplifyMorten Tokle2019-05-246-32/+35
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Move read methods to RoutingPoliciesMartin Polden2019-05-246-32/+35
* | | | | | | | Merge pull request #9541 from vespa-engine/olaa/change-default-valueolaaun2019-05-244-16/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed default logserver flag valueOla Aunrønning2019-05-244-16/+19
* | | | | | | | | Merge pull request #9543 from vespa-engine/balder/avoid-expensive-check-on-cloneJon Bratseth2019-05-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add setParent on cloneHenning Baldersheim2019-05-241-0/+1
| * | | | | | | | | Do not revalidate on cloneHenning Baldersheim2019-05-241-1/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #9544 from vespa-engine/bratseth/serialize-network-testsJon Bratseth2019-05-242-9/+18
|\ \ \ \ \ \ \ \ \