aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9391 from vespa-engine/freva/add-publiccdValerij Fredriksen2019-05-141-1/+1
|\
| * Always use value for SystemName, Environment and RegionNameValerij Fredriksen2019-05-141-1/+1
* | Merge pull request #9405 from vespa-engine/freva/use-new-default-lb-pathValerij Fredriksen2019-05-141-3/+3
|\ \
| * | Use new lb file pathValerij Fredriksen2019-05-141-3/+3
| |/
* | Merge pull request #9336 from vespa-engine/bjormel/Splunk-phoneHomeIntervalIn...Bjørn Meland2019-05-146-13/+23
|\ \
| * | VESPA-15154: phoneHomeIntervalInSecs for Splunk deployment-client cfgBjorn Meland2019-05-096-13/+23
* | | Merge pull request #9172 from vespa-engine/bjorncs/logserver-cleanupBjørn Christian Seime2019-05-142-6/+3
|\ \ \ | |_|/ |/| |
| * | Remove logserver legacy port from config modelBjørn Christian Seime2019-04-242-6/+3
* | | Merge pull request #9362 from vespa-engine/yngveaasheim/avoid-average-of-aver...gjoranv2019-05-131-34/+121
|\ \ \
| * | | [VESPA-15011] Remove TODOs for 'last' valuesYngve Aasheim2019-05-131-2/+3
| * | | [VESPA-15011] Avoid average of averages.Yngve Aasheim2019-05-101-36/+122
* | | | Merge pull request #9352 from vespa-engine/gjoranv/new-metrics-proxy_3gjoranv2019-05-1316-47/+901
|\ \ \ \
| * | | | Inline helper method.gjoranv2019-05-131-6/+1
| * | | | Move amending of default consumer to Admin.gjoranv2019-05-133-19/+21
| * | | | Allow adding metrics to the default consumer, for model amenders.gjoranv2019-05-108-24/+70
| * | | | Remove 'healthport' from vespa-services config.gjoranv2019-05-101-2/+1
| * | | | Exclude http-utils and apache httpclient.gjoranv2019-05-101-0/+11
| * | | | Use string constant from metrics-proxy to avoid duplication.gjoranv2019-05-101-1/+2
| * | | | New metrics-proxygjoranv2019-05-1013-40/+840
* | | | | Merge branch 'master' into balder/honour-jvm-elementHenning Baldersheim2019-05-1145-283/+372
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | AllocatedHost serialization completenessJon Bratseth2019-05-102-9/+8
| * | | | Nonfunctional changes onlyJon Bratseth2019-05-101-1/+0
| |/ / /
| * | | Garbage collect metrics removed with Vespa 6Yngve Aasheim2019-05-091-13/+0
| * | | Remove noop: The model version will always be the version this code is compil...Harald Musum2019-05-091-1/+0
| * | | Revert "Gjoranv/reapply new metrics proxy "Bjørn Christian Seime2019-05-0914-853/+41
| * | | Merge pull request #9329 from vespa-engine/bratseth/nonfunctional-changesJon Bratseth2019-05-092-5/+6
| |\ \ \
| | * | | Add a comment and rename some variablesJon Bratseth2019-05-092-5/+6
| | | |/ | | |/|
| | * | Revert "Bratseth/emit float tensors in config"Arnstein Ressem2019-05-0810-36/+31
| | * | Emit float tensor types in config when specifiedJon Bratseth2019-05-0710-31/+36
| * | | Exclude http-utils and apache httpclient.gjoranv2019-05-081-0/+11
| * | | Use string constant from metrics-proxy to avoid duplication.gjoranv2019-05-081-1/+2
| * | | Reapply Gjoranv/New metrics proxygjoranv2019-05-0713-40/+840
| * | | Revert "Gjoranv/New metrics proxy"gjoranv2019-05-0713-840/+40
| * | | Merge pull request #9266 from vespa-engine/gjoranv/new-metrics-proxy_rebased2gjoranv2019-05-0713-40/+840
| |\ \ \ | | |/ / | |/| |
| | * | Require consecutive ports and add tests for port allocation.gjoranv2019-05-073-7/+63
| | * | Use compile scope for metrics-proxy (not provided runtime).gjoranv2019-05-031-1/+1
| | * | Revert file that was modified by accident.gjoranv2019-05-031-5/+0
| | * | Add tests for metrics proxy model.gjoranv2019-05-033-26/+377
| | * | Install metrics-proxy on MetricsProxyContainerClusters.gjoranv2019-05-029-7/+405
| | * | New metrics-proxygjoranv2019-05-021-1/+1
| * | | Merge pull request #9291 from vespa-engine/bratseth/user-flavorsJon Bratseth2019-05-0737-246/+358
| |\ \ \
| | * | | Java isn't mathJon Bratseth2019-05-062-12/+10
| | * | | Add nodeResources accessorJon Bratseth2019-05-061-2/+2
| | * | | Merge branch 'master' into bratseth/user-flavorsJon Bratseth2019-05-0612-15/+133
| | |\ \ \
| | * | | | Test allocation by resourcesJon Bratseth2019-05-061-24/+88
| | * | | | Allow node allocation by resource specJon Bratseth2019-05-0610-46/+118
| | * | | | Allow continuous node resource specsJon Bratseth2019-05-0228-184/+162
| * | | | | Remove unused method (keep it in config model API for now)Harald Musum2019-05-063-13/+5
| | |/ / / | |/| | |
* | | | | jdisc -> containerHenning Baldersheim2019-05-021-64/+64
* | | | | Add support for an explicit 'jvm' elementHenning Baldersheim2019-05-024-13/+67
|/ / / /