aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com
Commit message (Expand)AuthorAgeFilesLines
* Update copyright headersJon Bratseth2017-06-14545-538/+545
* Remove carriage returnJon Bratseth2017-06-149-9/+9
* Merge pull request #2733 from yahoo/hmusum/16-distribution-bits-only-for-prodJon Bratseth2017-06-141-9/+19
|\
| * Use zoneHarald Musum2017-06-141-4/+11
| * Merge branch 'master' into hmusum/16-distribution-bits-only-for-prodHarald Musum2017-06-143-19/+12
| |\
| * | Enable 16 distribution bits only for prod regionsHarald Musum2017-06-131-9/+12
* | | Merge pull request #2755 from yahoo/hmusum/minor-cleanupgjoranv2017-06-147-68/+52
|\ \ \ | |_|/ |/| |
| * | Minor cleanupHarald Musum2017-06-147-68/+52
* | | Merge pull request #2751 from yahoo/hmusum/use-only-one-deploystateGeir Storli2017-06-141-2/+2
|\ \ \ | |/ / |/| |
| * | Make sure to create DeployState only once (and simplify due to that)Harald Musum2017-06-131-2/+2
* | | Remove last known usage of the default ctor on config classes.gjoranv2017-06-141-17/+9
|/ /
* | Revert "Remove last known usage of the default ctor on config classes."gjoranv2017-06-131-9/+17
* | Revert "Copyright header"Jon Bratseth2017-06-13545-554/+547
* | Merge with masterJon Bratseth2017-06-131-0/+1
|\ \
| * \ Merge pull request #2720 from yahoo/balder/add-zstd-compressorHenning Baldersheim2017-06-131-0/+1
| |\ \
| | * | Allow ZStandard compresion for summary store too.Henning Baldersheim2017-06-121-0/+1
* | | | Copyright headerJon Bratseth2017-06-13545-547/+554
|/ / /
* | / Remove last known usage of the default ctor on config classes.gjoranv2017-06-131-17/+9
| |/ |/|
* | Remove unused method in InstanceResolver.gjoranv2017-06-131-18/+0
|/
* Set the default constructor on config classes private.gjoranv2017-06-121-5/+16
* Revert "Set the default constructor on config classes private."Harald Musum2017-06-101-16/+5
* Set the default constructor on config classes private.gjoranv2017-06-091-5/+16
* [VESPA-5826] 16 distribution bits in us-east-3Yngve Aasheim2017-06-091-0/+1
* Revert "Revert "Revert "Gjoranv/remove default ctor4"""Harald Musum2017-06-081-11/+49
* Revert "Revert "Gjoranv/remove default ctor4""gjoranv2017-06-081-49/+11
* Revert "Gjoranv/remove default ctor4"Harald Musum2017-06-081-11/+49
* Merge with masterJon Bratseth2017-06-082-52/+13
|\
| * Merge pull request #2445 from yahoo/gjoranv/remove-default-ctor4gjoranv2017-06-081-49/+11
| |\
| | * Do not create a config instance with the default ctor.gjoranv2017-05-111-49/+11
| * | Whitelist correct non-docker metric names.gjoranv2017-06-061-3/+2
* | | Nonfunctional changesJon Bratseth2017-06-083-4/+4
|/ /
* | Revert "Revert "Revert "Revert "Bratseth/deployment delay""""Jon Bratseth2017-06-051-3/+3
* | Revert "Revert "Revert "Bratseth/deployment delay"""Harald Musum2017-06-031-3/+3
* | Re-add 'queries' metric removed by accident.gjoranv2017-06-031-0/+1
* | Merge pull request #2617 from yahoo/revert-2616-revert-2604-bratseth/deployme...Martin Polden2017-06-021-3/+3
|\ \
| * | Maintain backwards compatibility with earlier config modelsJon Bratseth2017-06-021-1/+1
| * | Revert "Revert "Bratseth/deployment delay""Jon Bratseth2017-06-021-3/+3
* | | Merge pull request #2615 from yahoo/ldalves/default-vespa-metricsgjoranv2017-06-024-7/+43
|\ \ \ | |/ / |/| |
| * | add a static import for 'singleton'Leandro Alves2017-06-022-2/+4
| * | add default vespa metrics to custom consumersLeandro Alves2017-06-024-6/+40
* | | Revert "Bratseth/deployment delay"Jon Bratseth2017-06-021-3/+3
|/ /
* | Merge pull request #2604 from yahoo/bratseth/deployment-delayMartin Polden2017-06-021-3/+3
|\ \
| * | Validate max total delayJon Bratseth2017-06-011-1/+1
| * | Allow delay steps in modelJon Bratseth2017-06-011-2/+2
| * | Add required steps at constructionJon Bratseth2017-06-011-1/+1
* | | Refactor VespaMetricSet to have a MetricSet instead of be one.gjoranv2017-06-013-11/+9
* | | Merge pull request #2602 from yahoo/gjoranv/system-metric-setgjoranv2017-06-015-5/+72
|\ \ \ | |/ / |/| |
| * | Add the 'system' metric set to all custom consumers.gjoranv2017-06-011-0/+3
| * | Add system metric set to the default consumer.gjoranv2017-06-011-4/+12
| * | Add new metric set for system metrics, and add to predefined sets.gjoranv2017-06-013-1/+57