summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* / Wire in deployment so that we can copy the file in when the old way is gone.Henning Baldersheim2017-11-091-6/+0
|/
* Revert "Revert "Remove configserver-app magic include""Martin Polden2017-11-091-24/+2
* Revert "Remove configserver-app magic include"Harald Musum2017-11-091-2/+24
* Remove magic includeMartin Polden2017-11-081-24/+2
* Merge pull request #3954 from vespa-engine/mortent/propagate-lbaddressMorten Tokle2017-11-085-5/+48
|\
| * Propagate loadBalancerAddressMorten Tokle2017-11-075-5/+48
* | Remove redundant overridesHåkon Hallingstad2017-11-071-15/+2
|/
* Merge pull request #4015 from vespa-engine/geirst/expose-more-content-spi-met...Tor Brede Vekterli2017-11-061-0/+2
|\
| * Expose content spi delete bucket metrics.Geir Storli2017-11-061-0/+2
* | Expose metrics for size of allocated lid space in proton.Geir Storli2017-11-061-0/+3
|/
* Merge branch 'master' into freva/instance-validatorValerij Fredriksen2017-11-024-0/+123
|\
| * Add reserved name validation for document type namesTor Brede Vekterli2017-11-024-0/+123
* | Set domain/service in Container serviceValerij Fredriksen2017-11-021-1/+5
|/
* Return job id and reason in application/v4Jon Bratseth2017-10-291-1/+0
* Merge pull request #3918 from vespa-engine/bratseth/add-copyright-headersJon Marius Venstad2017-10-276-0/+6
|\
| * Add copyright headerJon Bratseth2017-10-276-0/+6
* | Simplify identity configurationMorten Tokle2017-10-274-20/+10
|/
* Read configserver hostname while constructing identityMorten Tokle2017-10-263-11/+14
* Add load balancer address to identity configMorten Tokle2017-10-261-0/+6
* Refactor identity as config producerMorten Tokle2017-10-262-24/+20
* Always re-read application inside lockJon Bratseth2017-10-252-28/+3
* Merge pull request #3877 from vespa-engine/freva/disable-log-forwardHarald Musum2017-10-251-0/+1
|\
| * Disable log forward in hosted vespaValerij Fredriksen2017-10-251-0/+1
* | Move identity config to ContainerClusterMorten Tokle2017-10-253-16/+46
|/