aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Gjoranv/split parent2"gjoranv2017-11-301-1/+0
|
* Split parent + container-dependency-versions from root pom.gjoranv2017-11-301-0/+1
| | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent.
* Create Admin with filedistritbution config producerHarald Musum2017-11-303-13/+16
| | | | Supply it in constructor instead of setting it afterwards
* Revert "Gjoranv/split parent"gjoranv2017-11-291-1/+0
|
* Merge pull request #4304 from vespa-engine/gjoranv/split-parentgjoranv2017-11-291-0/+1
|\ | | | | Gjoranv/split parent
| * Split parent + container-dependency-versions from root pom.gjoranv2017-11-291-0/+1
| | | | | | | | | | | | - Add missing dependencies so that all provided non-yahoo jars are listed in container-dependency-versions. - Add relativePath for all child poms of parent.
* | Merge pull request #4299 from vespa-engine/bjorncs/ssl-truststore-configuratorBjørn Christian Seime2017-11-295-32/+75
|\ \ | | | | | | Bjorncs/ssl truststore configurator
| * | Add syntax for overriding SslTrustStoreConfigurator in services.xmlBjørn Christian Seime2017-11-285-32/+75
| | |
* | | Merge pull request #4301 from ↵Valerij Fredriksen2017-11-291-1/+0
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hmusum/remove-unused-temp-element-for-disabling-filedistributor Remove unused syntax for disabling file distributor, using <disableFi…
| * | | Remove unused syntax for disabling file distributor, using ↵Harald Musum2017-11-291-1/+0
| |/ / | | | | | | | | | <disableFiledistributor> now
* | | Merge pull request #4292 from vespa-engine/hmusum/remove-unused-test-appgjoranv2017-11-292-15/+0
|\ \ \ | | | | | | | | Remove unused test app
| * | | Remove unused test appHarald Musum2017-11-282-15/+0
| | |/ | |/|
* | | Revert "Remove zone from DeployProperties"Harald Musum2017-11-298-34/+37
| | |
* | | Merge pull request #4293 from ↵Morten Tokle2017-11-298-37/+34
|\ \ \ | |_|/ |/| | | | | | | | vespa-engine/hmusum/remove-zone-from-DeployProperties Remove zone from DeployProperties
| * | Remove zone from DeployPropertiesHarald Musum2017-11-288-40/+34
| |/ | | | | | | zone is already present in DeployState, no need to duplicate
* | Backwards compatibilityHarald Musum2017-11-281-1/+2
| |
* | Rename element to disable filedistributorHarald Musum2017-11-286-15/+13
|/ | | | Keep old until it is not used anymore
* More wiring for making it possible to disable filedistributorHarald Musum2017-11-272-1/+22
|
* Merge pull request #4277 from vespa-engine/freva/docker-container-kernel-usageValerij Fredriksen2017-11-271-0/+2
|\ | | | | Freva/docker container kernel usage
| * Export cpu.sys.util metricValerij Fredriksen2017-11-241-0/+2
| |
* | Add setting for turning off file distributorHarald Musum2017-11-2712-28/+68
| | | | | | | | | | | | If set, will not start file distributor on config server host and on tenant nodes, will instead use config proxy and file distribution will be done with RPC calls between config proxy and config server
* | Revert "Bratseth/select 1 host by index"Jon Bratseth2017-11-245-157/+77
| |
* | Merge pull request #4255 from ↵Geir Storli2017-11-233-7/+59
|\ \ | | | | | | | | | | | | vespa-engine/geirst/produce-new-bucket-spaces-config-for-distributor-nodes Produce new bucket spaces config for distributor nodes.
| * | Produce new bucket spaces config for distributor nodes.Geir Storli2017-11-233-7/+59
| | | | | | | | | | | | | | | This config contains all document types handled by a content cluster and the bucket space each document type belongs to.
* | | Merge pull request #4210 from ↵Lester Solbakken2017-11-234-1/+500
|\ \ \ | |_|/ |/| | | | | | | | vespa-engine/lesters/handle-tensor-max-and-min-in-config-model Lesters/handle tensor max and min in config model
| * | 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
|\ \ \ | | | | | | | | Move identity configuration services.xml -> deployment.xml
| * | | 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 logd
| * | skeleton for state reporting in logdArne Juul2017-11-211-4/+19
| |/ | | | | | | | | | | * allocate port in config model for logd state reporting * add state port to logd configuration * add a state server with no metrics production
* / 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 loadbalanceraddress
| * Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-156-33/+43
| |
* | Merge pull request #4169 from ↵gjoranv2017-11-161-5/+0
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/dont-depend-on-filedistribution Don't depend on filedistribution
| * | Don't depend on filedistributionHarald Musum2017-11-161-5/+0
| | | | | | | | | | | | No need to depend on filedistribution anymore, config defs are now in configdefinitions module
* | | 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
|\ \ | | | | | | Bjorncs/custom ssl context
| * | SslKeyStoreConfigurator components must have unique id specBjørn Christian Seime2017-11-151-2/+3
| | |