aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12398 from vespa-engine/mpolden/combined-idJon Marius Venstad2020-03-032-25/+50
|\
| * Add combined ID to ClusterSpecMartin Polden2020-03-022-25/+50
* | Revert "Bratseth/phrase segmenting feature flag"Arnstein Ressem2020-03-033-18/+4
* | Merge pull request #12399 from vespa-engine/bratseth/phrase-segmenting-featur...Jon Bratseth2020-03-023-4/+18
|\ \
| * | Add phrase-segmenting flagJon Bratseth2020-03-023-4/+18
| |/
* | Merge pull request #12392 from vespa-engine/gjoranv/prohibit-cloudwatch-for-h...gjoranv2020-03-022-0/+38
|\ \ | |/ |/|
| * Add validator for 'cloudwatch' in services.xmlgjoranv2020-03-022-0/+38
* | Export distributor GC documents_removed metricTor Brede Vekterli2020-02-281-0/+2
|/
* Add handling of optional 'file' attribute to 'shared-credentials'gjoranv2020-02-273-10/+25
* Modify xml syntax for cloudwatchgjoranv2020-02-272-10/+16
* Add flag that tells if this is hosted Vespa.gjoranv2020-02-271-0/+2
* Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/nod...Jon Bratseth2020-02-264-18/+12
* Revert "Bratseth/node metrics"Harald Musum2020-02-264-12/+18
* Merge pull request #12346 from vespa-engine/gjoranv/add-telegraf-componentgjoranv2020-02-262-1/+23
|\
| * Add Telegraf components to metrics-proxy clustersgjoranv2020-02-262-1/+23
* | Merge branch 'master' into bratseth/node-metricsJon Bratseth2020-02-2511-13/+147
|\|
| * Export list of whitelisted handlers from AccessControlBjørn Christian Seime2020-02-251-2/+1
| * Revert "Revert "Control -XX:CompressedClassSpaceSize jvm option.""Henning Baldersheim2020-02-203-2/+2
| * Revert "Add Telegraf components to metrics-proxy clusters."gjoranv2020-02-201-4/+0
| * Merge pull request #12288 from vespa-engine/gjoranv/add-telegraf-componentsgjoranv2020-02-201-0/+4
| |\
| | * Add Telegraf components to metrics-proxy clusters.gjoranv2020-02-201-0/+4
| * | Merge pull request #12287 from vespa-engine/geirst/integrate-nearest-neighbor...Geir Storli2020-02-201-8/+10
| |\ \
| | * | Don't deactivate processing of index settings when validation is turned off.Geir Storli2020-02-201-8/+10
| * | | Revert "Control -XX:CompressedClassSpaceSize jvm option."Bjørn Christian Seime2020-02-203-2/+2
| | |/ | |/|
| * | Put back CMS as it was actually used.Henning Baldersheim2020-02-201-0/+1
| * | Control -XX:CompressedClassSpaceSize jvm option.Henning Baldersheim2020-02-203-3/+2
| * | Reduce max heap from 512m to 384mHenning Baldersheim2020-02-201-0/+9
| * | Merge pull request #12264 from vespa-engine/andreer/more-informative-certific...Andreas Eriksen2020-02-201-1/+1
| |\ \
| | * | include app name in CERTIFICATE_NOT_READY messageandreer2020-02-191-1/+1
| * | | Merge pull request #12261 from vespa-engine/gjoranv/cloudwatch-consumer-syntaxgjoranv2020-02-205-2/+126
| |\ \ \ | | |_|/ | |/| |
| | * | Propagate cloudwatch setup to telegraf config.gjoranv2020-02-195-2/+126
* | | | Fetch metrics from a containerJon Bratseth2020-02-251-2/+3
* | | | Use correct metric output namesJon Bratseth2020-02-241-0/+1
* | | | Merge branch 'master' into bratseth/node-metricsJon Bratseth2020-02-2056-317/+655
|\| | |
| * | | Component id must be globally unique. Not enough to be unique in the branch.Henning Baldersheim2020-02-193-12/+13
| * | | Revert "Revert "Revert "Revert "Create a resourcepool so that we do not need ...Henning Baldersheim2020-02-194-3/+31
| * | | Revert "Revert "Revert "Create a resourcepool so that we do not need to recon...Harald Musum2020-02-194-31/+3
| * | | Merge pull request #12202 from vespa-engine/revert-12197-revert-12184-balder/...Henning Baldersheim2020-02-184-3/+31
| |\ \ \ | | |_|/ | |/| |
| | * | Use class.getName to get compile time error detection.Henning Baldersheim2020-02-173-4/+4
| | * | Make the resourcepool a proper child of the dispatcher.Henning Baldersheim2020-02-152-10/+9
| | * | Let rpcresourcepool be a child of dispatcher and inject it.Henning Baldersheim2020-02-143-18/+15
| | * | Revert "Revert "Create a resourcepool so that we do not need to reconnect to ...Henning Baldersheim2020-02-142-0/+32
| | * | Revert "Create a resourcepool so that we do not need to reconnect to content ...Harald Musum2020-02-142-32/+0
| * | | [VESPA-15448] Add missing suffixesYngve Aasheim2020-02-181-3/+3
| * | | Merge pull request #12208 from vespa-engine/bratseth/dont-allow-wrong-service...Jon Bratseth2020-02-181-7/+3
| |\ \ \
| | * | | Disallow configuring the wrong port when hostedJon Bratseth2020-02-151-7/+3
| * | | | Merge pull request #12232 from vespa-engine/geirst/config-for-hnsw-index-on-t...Geir Storli2020-02-187-20/+165
| |\ \ \ \
| | * | | | Add support for specifying a hnsw index together with a 1-dimensional indexed...Geir Storli2020-02-177-20/+165
| | | |/ / | | |/| |
| | * | | Add missing file.Henning Baldersheim2020-02-141-0/+31
| | * | | Create a resourcepool so that we do not need to reconnect to content cluster ...Henning Baldersheim2020-02-131-0/+1
| | |/ /