summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo
Commit message (Expand)AuthorAgeFilesLines
* Merge with masterJon Bratseth2017-12-1437-179/+371
|\
| * Produce bucketspaces config for entire content cluster.Geir Storli2017-12-132-22/+18
| * Notify config proxy about starting downloads while preparingHarald Musum2017-12-131-4/+2
| * Expose new metric for replay time of the transaction log.Geir Storli2017-12-081-0/+1
| * Merge pull request #4373 from vespa-engine/geirst/fix-handling-of-imported-pr...Jon Bratseth2017-12-073-1/+70
| |\
| | * Add validator that fails if imported predicate fields are used in document su...Geir Storli2017-12-062-0/+64
| | * Fix such that a predicate field can be imported from a parent into a child type.Geir Storli2017-12-061-1/+6
| * | add "logd.processed.lines" to VespaMetricSetArne Juul2017-12-071-0/+1
| |/
| * Expose new proton resource limit metrics.Geir Storli2017-12-041-0/+2
| * Do not setup a service for filedistributor when it is disabledHarald Musum2017-11-308-65/+155
| * Remove unused ymonService propertyHarald Musum2017-11-3010-27/+1
| * Create Admin with filedistritbution config producerHarald Musum2017-11-302-12/+11
| * Add syntax for overriding SslTrustStoreConfigurator in services.xmlBjørn Christian Seime2017-11-282-16/+34
| * Backwards compatibilityHarald Musum2017-11-281-1/+2
| * Rename element to disable filedistributorHarald Musum2017-11-284-10/+10
| * More wiring for making it possible to disable filedistributorHarald Musum2017-11-271-1/+2
| * 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-2710-25/+59
* | | Fall back to sort by hostname if a host has no membershipJon Bratseth2017-11-2411-35/+42
* | | Revert "Revert "Bratseth/select 1 host by index""Jon Bratseth2017-11-243-12/+47
|/ /
* | Revert "Bratseth/select 1 host by index"Jon Bratseth2017-11-243-47/+12
* | Merge pull request #4255 from vespa-engine/geirst/produce-new-bucket-spaces-c...Geir Storli2017-11-232-2/+26
|\ \
| * | Produce new bucket spaces config for distributor nodes.Geir Storli2017-11-232-2/+26
* | | Merge pull request #4210 from vespa-engine/lesters/handle-tensor-max-and-min-...Lester Solbakken2017-11-233-1/+294
|\ \ \ | |_|/ |/| |
| * | Make catch exception more specific in tensor transformerLester Solbakken2017-11-232-17/+26
| * | Add copyright headerLester Solbakken2017-11-211-0/+1
| * | Replace min/max on tensors with reduce in config modelLester Solbakken2017-11-212-0/+283
* | | Merge pull request #4203 from vespa-engine/mortent/identity-in-deploymentMorten Tokle2017-11-233-86/+68
|\ \ \
| * | | RenameMorten Tokle2017-11-221-3/+3
| * | | Remove deploymentspec member variableMorten Tokle2017-11-221-29/+26
| * | | Rename Identity -> IdentityProviderMorten Tokle2017-11-222-12/+12
| * | | Move deployment spec ContainerCluster -> ContainerModelBuilderMorten Tokle2017-11-223-93/+80
| * | | Move identity configuration services.xml -> deployment.xmlMorten Tokle2017-11-212-35/+33
| |/ /
* | | Pick 1 cluster controller by indexJon Bratseth2017-11-222-14/+26
* | | Pick 1 slobrok by indexJon Bratseth2017-11-221-1/+1
* | | 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-221-4/+19
| |/ |/|
* | 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-164-27/+33
|\
| * Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-154-27/+33
| * Revert "Treat loadbalancer address as string and pass through"Harald Musum2017-11-143-24/+21
| * Treat loadbalancer address as string and pass throughMorten Tokle2017-11-143-21/+24
* | Setup injection of SslKeyStoreConfigurator in config-modelBjørn Christian Seime2017-11-161-1/+3
* | 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-152-11/+15
* | Code cleanup: remove 'final' on local variables, less whitespaceBjørn Christian Seime2017-11-151-9/+2