aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #15542 from vespa-engine/revert-15540-bratseth/app...Jon Bratseth2020-11-304-5/+21
* Revert "Bratseth/apply on restart take 6"Jon Bratseth2020-11-304-21/+5
* Revert "Merge pull request #15532 from vespa-engine/revert-15527-bratseth/app...Jon Bratseth2020-11-304-5/+21
* Revert "Bratseth/apply on restart take 5"Jon Bratseth2020-11-304-21/+5
* Merge pull request #15527 from vespa-engine/bratseth/apply-on-restart-take-5Jon Bratseth2020-11-304-5/+21
|\
| * Revert "Merge pull request #15521 from vespa-engine/revert-15520-bratseth/app...Jon Bratseth2020-11-304-5/+21
* | Remove unnecessary checkHarald Musum2020-11-301-3/+0
* | Generate correct zookeeper server config and fix setup of componentsHarald Musum2020-11-303-5/+15
|/
* Merge pull request #15522 from vespa-engine/bratseth/reject-tensor-attribute-...Jon Bratseth2020-11-291-3/+7
|\
| * Reject queries searching tensor fieldsJon Bratseth2020-11-291-3/+7
* | Revert "Bratseth/apply on restart take 4"Jon Bratseth2020-11-294-21/+5
|/
* Revert "Merge pull request #15510 from vespa-engine/revert-15508-bratseth/app...Jon Bratseth2020-11-294-5/+21
* Revert "Bratseth/apply on restart take 3"Jon Bratseth2020-11-274-21/+5
* Merge pull request #15508 from vespa-engine/bratseth/apply-on-restart-take-3Jon Bratseth2020-11-274-5/+21
|\
| * Revert "Merge pull request #15495 from vespa-engine/revert-15494-bratseth/app...Jon Bratseth2020-11-274-5/+21
* | Merge pull request #15497 from vespa-engine/balder/gc-load-metrics-2Henning Baldersheim2020-11-271-0/+1
|\ \ | |/ |/|
| * Remove loadmetrics indirection.Henning Baldersheim2020-11-261-0/+1
* | Merge pull request #15499 from vespa-engine/hmusum/set-id-for-each-zookeeper-...Harald Musum2020-11-272-15/+29
|\ \
| * | Check that parent is non-null and of correct typeHarald Musum2020-11-271-1/+5
| * | CleanupHarald Musum2020-11-271-9/+9
| * | Id needs to be set for each containerHarald Musum2020-11-271-6/+16
* | | Merge pull request #15480 from vespa-engine/jonmv/messagebus-avoid-config-sel...Henning Baldersheim2020-11-272-13/+13
|\ \ \ | |/ / |/| |
| * | Non-functional changesJon Marius Venstad2020-11-262-13/+13
* | | Merge pull request #15486 from vespa-engine/hmusum/configure-zookeeper-clusterHarald Musum2020-11-262-2/+20
|\ \ \
| * | | Fix package and bundle namesHarald Musum2020-11-261-2/+2
| * | | No need for feature flagHarald Musum2020-11-261-4/+1
| * | | Setup components and config for container cluster when zookeeper is configuredHarald Musum2020-11-262-2/+23
* | | | Revert "Bratseth/apply on restart take 2"Harald Musum2020-11-264-22/+6
* | | | Revert "Merge pull request #15492 from vespa-engine/revert-15450-bratseth/app...Jon Bratseth2020-11-264-6/+22
| |_|/ |/| |
* | | Revert "Support marking configs as apply on restart"Harald Musum2020-11-264-22/+6
|/ /
* | Merge pull request #15450 from vespa-engine/bratseth/apply-on-restartJon Bratseth2020-11-264-6/+22
|\ \
| * | Set applyOnRestart when appropriateJon Bratseth2020-11-252-4/+4
| * | Support marking configs as apply on restartJon Bratseth2020-11-242-2/+18
* | | Merge pull request #15483 from vespa-engine/mpolden/zk-serviceMartin Polden2020-11-268-60/+45
|\ \ \
| * | | Avoid producing CuratorConfig multiple times for config serverMartin Polden2020-11-261-4/+3
| * | | Support configuring ZooKeeper service in containerMartin Polden2020-11-261-1/+24
| * | | Make ContainerCluster produce CuratorConfigMartin Polden2020-11-267-21/+22
| * | | Remove dead codeMartin Polden2020-11-261-38/+0
| | |/ | |/|
* / | Also take number of visitor threads into account.Henning Baldersheim2020-11-262-1/+10
|/ /
* | Revert "Support configuring ZooKeeper service in container"Harald Musum2020-11-258-46/+60
* | Support configuring ZooKeeper service in containerMartin Polden2020-11-251-1/+24
* | Make ContainerCluster produce CuratorConfigMartin Polden2020-11-257-21/+22
* | Remove dead codeMartin Polden2020-11-241-38/+0
|/
* Merge pull request #15434 from vespa-engine/mortent/vespa-tls-filterMorten Tokle2020-11-232-8/+43
|\
| * Create default connector request chainMorten Tokle2020-11-232-8/+43
* | Merge pull request #15421 from vespa-engine/jonmv/reindexing-rest-api-take2Jon Marius Venstad2020-11-233-59/+43
|\ \
| * | Use a more conventional logger name for the VespaModelJon Marius Venstad2020-11-231-1/+1
| * | Move ReindexingConfig up into ClusterControllerContainerJon Marius Venstad2020-11-232-62/+42
| * | Revert "Revert "Jonmv/reindexing rest api""Jon Marius Venstad2020-11-231-0/+4
* | | Add reindexing.progress to VespaMetricSetJon Marius Venstad2020-11-231-0/+2
|/ /