summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Wire in deployment so that we can copy the file in when the ↵Henning Baldersheim2017-11-131-6/+0
| | | | old way i…""
* 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 config
| * Send lbaddress in identity configMorten Tokle2017-11-102-19/+16
| |
* | Merge pull request #4084 from ↵Harald Musum2017-11-101-0/+6
|\ \ | | | | | | | | | | | | vespa-engine/revert-4067-balder/wire-in-filecopy-on-deploy-the-new-way Revert "Wire in deployment so that we can copy the file in when the old way i…"
| * | Revert "Wire in deployment so that we can copy the file in when the old way ↵Henning Baldersheim2017-11-101-0/+6
| | | | | | | | | | | | i…"
* | | 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 ↵Henning Baldersheim2017-11-105-37/+78
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/add-option-to-disable-filedistributor Add 'disabled' option for filedistribution
| * | Add 'disabled' option for filedistributionHarald Musum2017-11-105-37/+78
| |/ | | | | | | If disabled, filedistributor service will not be started
* / 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 loadBalancerAddress
| * Propagate loadBalancerAddressMorten Tokle2017-11-075-5/+48
| |
* | Remove redundant overridesHåkon Hallingstad2017-11-071-15/+2
|/
* Merge pull request #4015 from ↵Tor Brede Vekterli2017-11-061-0/+2
|\ | | | | | | | | vespa-engine/geirst/expose-more-content-spi-metrics Expose content spi delete bucket metrics.
| * 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
|\ | | | | | | | | | | # Conflicts: # athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzInstanceProviderService.java # athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzInstanceProviderServiceTest.java
| * Add reserved name validation for document type namesTor Brede Vekterli2017-11-024-0/+123
| | | | | | | | | | | | Reserved names are those that cause ambiguity with the selection language used for routing documents into clusters and evaluating GC expressions.
* | 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 header
| * 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 vespa
| * Disable log forward in hosted vespaValerij Fredriksen2017-10-251-0/+1
| |
* | Move identity config to ContainerClusterMorten Tokle2017-10-253-16/+46
|/
* Activate disk usage sampling for docker nodes that have shared disk.Geir Storli2017-10-242-0/+16
|
* Expose domain and service from AthenzIDPMorten Tokle2017-10-241-1/+1
|
* Add copyrightMorten Tokle2017-10-241-0/+1
|
* separate interface from implementationMorten Tokle2017-10-241-1/+1
|
* Whitelist totalRestarts in VespaMetricsSetHåkon Hallingstad2017-10-231-0/+1
|
* Use correct configMorten Tokle2017-10-231-2/+2
|
* serviceproviderendpoing -> load_balancer_addressMorten Tokle2017-10-232-2/+2
|
* Merge pull request #3830 from ↵Morten Tokle2017-10-2310-12/+97
|\ | | | | | | | | vespa-engine/bjorncs/athenz-identity-provider-service Initial Athenz copper argos implementation
| * Add athenzidentityprovider componentMorten Tokle2017-10-231-0/+1
| |
| * Add fields to signed identity documentMorten Tokle2017-10-231-0/+3
| |
| * Add Athenz identity provider and configurationMorten Tokle2017-10-209-12/+93
| |
* | Config definitions moved to another location.Arnstein Ressem2017-10-201-1/+1
| |
* | Revert "Add back SslKeyStoreFactoryProvider as a temporary workaround"Bjørn Christian Seime2017-10-191-1/+0
|/
* Merge pull request #3781 from vespa-engine/arnej/add-uptime-metric-for-sentinelArne H Juul2017-10-171-0/+1
|\ | | | | Arnej/add uptime metric for sentinel
| * sentinel.uptime could be usefulArne Juul2017-10-171-0/+1
| |
* | Use ImmutableSetHarald Musum2017-10-171-3/+4
| |