summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support native Vespa standalone modelsJon Bratseth2019-05-3118-31/+524
|
* Merge pull request #9621 from vespa-engine/freva/fix-unstable-testHarald Musum2019-05-301-1/+1
|\ | | | | Increase timeout for test stability
| * Increase timeout for test stabilityValerij Fredriksen2019-05-301-1/+1
| |
* | Merge pull request #9607 from ↵Håkon Hallingstad2019-05-301-9/+6
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/add-logserver-container-to-slobrok-monitor-manager Add logserver container to slobrok monitor manager
| * | Add logserver container to slobrok monitor managerHarald Musum2019-05-291-9/+6
| | |
* | | Merge pull request #9620 from vespa-engine/balder/also-use-vector-as-dimensionHenning Baldersheim2019-05-304-44/+65
|\ \ \ | |_|/ |/| | attribute and query vector are 2 completely different dimensions.
| * | attribute and query vector are 2 completely different dimensions.Henning Baldersheim2019-05-304-44/+65
|/ / | | | | | | That must be reflected in the ObjectStore too.
* | Merge pull request #9610 from ↵gjoranv2019-05-307-30/+37
|\ \ | | | | | | | | | | | | vespa-engine/revert-9602-revert-9501-gjoranv/switch-to-new-metricsproxy Reapply "Switch to new metrics proxy."
| * | Revert "Revert "Switch to new metrics proxy." MERGEOK"gjoranv2019-05-297-30/+37
| | |
* | | Merge pull request #9618 from vespa-engine/gjoranv/update-services-correctlyJon Bratseth2019-05-293-8/+7
|\ \ \ | | | | | | | | Gjoranv/update services correctly
| * | | Minor non-functional improvements.gjoranv2019-05-292-4/+3
| | | |
| * | | Bugfix: set sentinel client before updating services.gjoranv2019-05-291-4/+4
|/ / /
* | | Merge pull request #9617 from vespa-engine/gjoranv/simplify-config-buildingHenning Baldersheim2019-05-291-10/+4
|\ \ \ | | | | | | | | Simplify by using the existing struct builders.
| * | | Simplify by using the existing struct builders.gjoranv2019-05-291-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using the builder setter for a struct replaces it, cancelling all changes made by config producers further up in the model tree. Struct builders are never null, and should normally be operated directly upon, without replacing.
* | | | Merge pull request #9611 from vespa-engine/hmusum/use-isCdValerij Fredriksen2019-05-291-3/+2
|\ \ \ \ | |/ / / |/| | | Use isCD so that this is done for all CD systems
| * | | Use isCD so that this is done for all CD systemsHarald Musum2019-05-291-3/+2
| |/ /
* | | Merge pull request #9615 from vespa-engine/gjoranv/disable-verbose-gcHenning Baldersheim2019-05-293-1/+26
|\ \ \ | | | | | | | | Disable verbose gc for metricsproxy containers.
| * | | Disable verbose gc for metricsproxy containers.gjoranv2019-05-293-1/+26
| | | |
* | | | Merge pull request #9616 from ↵Valerij Fredriksen2019-05-2920-157/+92
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/revert-9600-freva/set-default-target-ver Revert "Always return a target version for appropriate node types"
| * | | Revert "Always return a target version for appropriate node types"Valerij Fredriksen2019-05-2920-157/+92
|/ / /
* | | Merge pull request #9608 from vespa-engine/hakonhall/define-systemtypeHåkon Hallingstad2019-05-293-17/+42
|\ \ \ | | | | | | | | Define SystemName::isPublic
| * | | Replace SystemType with SystemName::isPublicHåkon Hallingstad2019-05-293-41/+15
| | | |
| * | | Define SystemNameHåkon Hallingstad2019-05-294-19/+70
| | | |
* | | | Merge pull request #9600 from vespa-engine/freva/set-default-target-verValerij Fredriksen2019-05-2920-92/+157
|\ \ \ \ | |_|/ / |/| | | Always return a target version for appropriate node types
| * | | Camel case variable nameValerij Fredriksen2019-05-291-3/+3
| | | |
| * | | Always return a target version for appropriate node typesValerij Fredriksen2019-05-285-79/+128
| | | |
| * | | Propagate server NodeType to NodeRepository from configValerij Fredriksen2019-05-2815-12/+28
| | | |
* | | | Merge pull request #9609 from vespa-engine/gjoranv/prepare-metricsproxy-clustergjoranv2019-05-294-5/+27
|\ \ \ \ | | | | | | | | | | Prepare metricsproxy container cluster to produce app metadata
| * | | | Prepare metricsproxy container cluster to produce app metadatagjoranv2019-05-294-5/+27
| | |_|/ | |/| |
* | | | Merge pull request #9603 from vespa-engine/bratseth/initialize-missing-valuesJon Bratseth2019-05-292-28/+17
|\ \ \ \ | | | | | | | | | | Initialize missing values.
| * | | | Initialize missing valuesJon Bratseth2019-05-292-28/+17
| | | | |
* | | | | Merge pull request #9592 from vespa-engine/bjorncs/security-toolsBjørn Christian Seime2019-05-298-0/+160
|\ \ \ \ \ | | | | | | | | | | | | Add 'security-tools' with 'vespa-tls-env' command line tool
| * | | | | Rename 'vespa-security-env' -> 'vespa-security-env'Bjørn Christian Seime2019-05-284-4/+4
| | | | | |
| * | | | | Add 'security-tools' with 'vespa-tls-env' command line toolBjørn Christian Seime2019-05-288-0/+160
| | | | | |
* | | | | | Merge pull request #9593 from vespa-engine/ollivir/java-dispatch-protobuf-onlyOlli Virtanen2019-05-2912-187/+111
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only use RPC/protobuf in java dispatch
| * | | | | | Minor fixesOlli Virtanen2019-05-282-3/+2
| | | | | | |
| * | | | | | Java dispatcher only uses RPC/protobufOlli Virtanen2019-05-2812-187/+112
| | | | | | |
* | | | | | | Merge pull request #9596 from vespa-engine/bjorncs/ssl-session-resumption-prepsBjørn Christian Seime2019-05-292-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Bjorncs/ssl session resumption preps
| * | | | | | Allow 'null' as alias to getCertificateChain/getPrivateKeyBjørn Christian Seime2019-05-281-0/+2
| | | | | | |
| * | | | | | Add readmeBjørn Christian Seime2019-05-281-0/+3
| | | | | | |
* | | | | | | Merge pull request #9605 from vespa-engine/bratseth/correct-default-cpuJon Bratseth2019-05-292-1/+22
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Correct default cpu: 2 means 1.5 MERGEOK
| * | | | | | Correct default cpu: 2 means 1.5Jon Bratseth2019-05-292-1/+22
|/ / / / / /
* | | | | | Merge pull request #9602 from ↵Arnstein Ressem2019-05-297-37/+30
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | vespa-engine/revert-9501-gjoranv/switch-to-new-metricsproxy Revert "Switch to new metrics proxy." MERGEOK
| * | | | | Revert "Switch to new metrics proxy."gjoranv2019-05-297-37/+30
|/ / / / /
* | | | | Merge pull request #9601 from ↵Jon Marius Venstad2019-05-2911-103/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9531-jvenstad/config-super-model-last-take Revert "Jvenstad/config super model last take"
| * | | | | Revert "Jvenstad/config super model last take"Jon Marius Venstad2019-05-2911-103/+36
|/ / / / /
* | | | | Merge pull request #9501 from vespa-engine/gjoranv/switch-to-new-metricsproxygjoranv2019-05-287-30/+37
|\ \ \ \ \ | | | | | | | | | | | | Switch to new metrics proxy.
| * | | | | Revert "Always return true for feature flag for new metrics proxy."gjoranv2019-05-236-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - keep it for now, just in case This reverts commit 233a9677d49cc01d4a5938a8fa2d849c5b9d4d46.
| * | | | | Always return true for feature flag for new metrics proxy.gjoranv2019-05-236-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | TODO: set correct oldest config model version in comment.
| * | | | | Enable new metrics proxy.gjoranv2019-05-237-30/+37
| | | | | | | | | | | | | | | | | | | | | | | | - Bypass the feature flag, but keep it for now, just in case.