summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4277 from vespa-engine/freva/docker-container-kernel-usageValerij Fredriksen2017-11-271-0/+2
|\
| * Export cpu.sys.util metricValerij Fredriksen2017-11-241-0/+2
* | Add setting for turning off file distributorHarald Musum2017-11-2712-28/+68
* | Revert "Bratseth/select 1 host by index"Jon Bratseth2017-11-245-157/+77
* | Merge pull request #4255 from vespa-engine/geirst/produce-new-bucket-spaces-c...Geir Storli2017-11-233-7/+59
|\ \
| * | Produce new bucket spaces config for distributor nodes.Geir Storli2017-11-233-7/+59
* | | Merge pull request #4210 from vespa-engine/lesters/handle-tensor-max-and-min-...Lester Solbakken2017-11-234-1/+500
|\ \ \ | |_|/ |/| |
| * | Make catch exception more specific in tensor transformerLester Solbakken2017-11-233-18/+28
| * | Add copyright headerLester Solbakken2017-11-211-0/+1
| * | Replace min/max on tensors with reduce in config modelLester Solbakken2017-11-213-0/+488
* | | Merge pull request #4203 from vespa-engine/mortent/identity-in-deploymentMorten Tokle2017-11-2311-156/+177
|\ \ \
| * | | RenameMorten Tokle2017-11-221-3/+3
| * | | Move routing test to own classMorten Tokle2017-11-224-48/+80
| * | | Remove deploymentspec member variableMorten Tokle2017-11-221-29/+26
| * | | Rename Identity -> IdentityProviderMorten Tokle2017-11-223-14/+14
| * | | Move deployment spec ContainerCluster -> ContainerModelBuilderMorten Tokle2017-11-224-94/+81
| * | | Move identity configuration services.xml -> deployment.xmlMorten Tokle2017-11-217-58/+63
| |/ /
* | | Pick 1 cluster controller by indexJon Bratseth2017-11-223-20/+67
* | | Pick 1 slobrok by indexJon Bratseth2017-11-222-4/+4
* | | Prepare to select slobroks by index (no change)Jon Bratseth2017-11-223-24/+32
* | | Prepare to select host by index (no change)Jon Bratseth2017-11-223-68/+93
| |/ |/|
* | Merge pull request #4224 from vespa-engine/arnej/logd-add-state-reporterHarald Musum2017-11-211-4/+19
|\ \
| * | skeleton for state reporting in logdArne Juul2017-11-211-4/+19
| |/
* / Nonfunctional changes onlyJon Bratseth2017-11-212-5/+6
|/
* Merge pull request #4145 from vespa-engine/mortent/add-lbaddress-nameMorten Tokle2017-11-166-33/+43
|\
| * Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-156-33/+43
* | Merge pull request #4169 from vespa-engine/hmusum/dont-depend-on-filedistribu...gjoranv2017-11-161-5/+0
|\ \
| * | Don't depend on filedistributionHarald Musum2017-11-161-5/+0
* | | Assert that there is only a single injected componentBjørn Christian Seime2017-11-161-0/+2
|/ /
* | Setup injection of SslKeyStoreConfigurator in config-modelBjørn Christian Seime2017-11-162-1/+6
* | Merge pull request #4132 from vespa-engine/bjorncs/custom-ssl-contextBjørn Christian Seime2017-11-166-28/+84
|\ \
| * | SslKeyStoreConfigurator components must have unique id specBjørn Christian Seime2017-11-151-2/+3
| * | Cleanup ConnectorFactoryBjørn Christian Seime2017-11-151-19/+18
| * | Configure default SslKeyStoreConfigurator in config-model's ConnectorFactoryBjørn Christian Seime2017-11-153-19/+30
| * | Code cleanup: remove 'final' on local variables, less whitespaceBjørn Christian Seime2017-11-151-9/+2
| * | Comment that syntax is for internal use onlyBjørn Christian Seime2017-11-151-1/+1
| * | Support custom SslKeyStoreConfigurator implementation in services.xmlBjørn Christian Seime2017-11-147-4/+56
* | | Remove support for minSlobroksPerClusterHarald Musum2017-11-153-5/+0
| |/ |/|
* | Revert "Treat loadbalancer address as string and pass through"Harald Musum2017-11-145-32/+27
* | Treat loadbalancer address as string and pass throughMorten Tokle2017-11-145-27/+32
|/
* Revert "Revert "Wire in deployment so that we can copy the file in when the o...Henning Baldersheim2017-11-131-6/+0
* If filedistributor is disabled, use config proxy port to ask for filesHarald Musum2017-11-102-2/+4
* Merge pull request #4079 from vespa-engine/mortent/athenz-send-lbaddressBjørn Christian Seime2017-11-102-19/+16
|\
| * Send lbaddress in identity configMorten Tokle2017-11-102-19/+16
* | Merge pull request #4084 from vespa-engine/revert-4067-balder/wire-in-filecop...Harald Musum2017-11-101-0/+6
|\ \
| * | Revert "Wire in deployment so that we can copy the file in when the old way i...Henning Baldersheim2017-11-101-0/+6
* | | Revert "Revert "Add 'disabled' option for filedistribution""Harald Musum2017-11-105-37/+78
|/ /
* | Revert "Add 'disabled' option for filedistribution"Henning Baldersheim2017-11-105-78/+37
* | Merge pull request #4081 from vespa-engine/hmusum/add-option-to-disable-filed...Henning Baldersheim2017-11-105-37/+78
|\ \
| * | Add 'disabled' option for filedistributionHarald Musum2017-11-105-37/+78
| |/