aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into hmusum/use-config-subscriber-for-slobrok-configHarald Musum2019-09-01240-1831/+2150
|\
| * Merge pull request #10470 from vespa-engine/bratseth/variants-with-multiple-i...Jon Bratseth2019-08-302-4/+30
| |\
| | * Compile all variants also with multiple inheritanceJon Bratseth2019-08-302-4/+30
| * | Merge pull request #10466 from vespa-engine/gjoranv/prometheus-handlergjoranv2019-08-3018-150/+613
| |\ \
| | * | Move static utilities into the http handler base class.gjoranv2019-08-304-65/+36
| | * | Extract base class for http handlers to avoid code duplicationgjoranv2019-08-303-37/+75
| | * | Avoid duplicating string constantsgjoranv2019-08-293-7/+4
| | * | Add PrometheusHandler to metrics-proxy clusters.gjoranv2019-08-292-6/+28
| | * | Add vespa service as dimension instead of prefix to metric names.gjoranv2019-08-272-1/+14
| | * | Add Prometheus http apigjoranv2019-08-2713-7/+369
| | * | Extract a base class for http handler tests.gjoranv2019-08-272-77/+105
| | * | Make ValuesFetcher return MetricsPackets instead of jsongjoranv2019-08-272-4/+6
| | * | Extract rest api utils to new classgjoranv2019-08-262-35/+58
| | * | Add missing test for invalid pathgjoranv2019-08-261-1/+8
| * | | Merge pull request #10467 from vespa-engine/bratseth/symmetric-null-checkArne H Juul2019-08-301-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Check for b being nullJon Bratseth2019-08-301-0/+3
| * | | Merge pull request #10465 from vespa-engine/balder/do-not-allow-adjustment-of...Henning Baldersheim2019-08-292-3/+11
| |\ \ \ | | |/ / | |/| |
| | * | Update log messageHenning Baldersheim2019-08-291-2/+2
| | * | Do not allow adjustment of soft timout factor the first 60 seconds after a ma...Henning Baldersheim2019-08-292-1/+9
| |/ /
| * | Merge pull request #10464 from vespa-engine/hakonhall/report-retired-metricHåkon Hallingstad2019-08-291-0/+2
| |\ \
| | * | Report retired metricHåkon Hallingstad2019-08-291-0/+2
| * | | Merge pull request #10458 from vespa-engine/hmusum/remove-unused-code-3gjoranv2019-08-292-48/+11
| |\ \ \
| | * | | Need SessionCacheHarald Musum2019-08-291-0/+4
| | * | | Remove unused codeHarald Musum2019-08-292-48/+7
| * | | | Merge pull request #10462 from vespa-engine/mortent/fix-commentAndreas Eriksen2019-08-291-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix commentMorten Tokle2019-08-291-1/+1
| |/ / /
| * | | Merge pull request #10461 from vespa-engine/balder/implement-fieldSet-properl...Jon Bratseth2019-08-294-9/+51
| |\ \ \
| | * | | Call addFieldSets for genrated document types in order for fieldSet and field...Henning Baldersheim2019-08-294-9/+51
| |/ / /
| * | | Merge pull request #10460 from vespa-engine/olaa/increase-metering-frequencyØyvind Grønnesby2019-08-291-1/+1
| |\ \ \
| | * | | Increase maintainer frequencyOla Aunrønning2019-08-261-1/+1
| * | | | Merge pull request #10457 from vespa-engine/andreer/hashed-dns-nameMorten Tokle2019-08-291-0/+10
| |\ \ \ \
| | * | | | ensure dns label can't be all numeralsandreer2019-08-291-1/+1
| | * | | | more bits, better encodingandreer2019-08-291-2/+4
| | * | | | make hashed dns name from application idandreer2019-08-291-0/+8
| * | | | | Merge pull request #10456 from vespa-engine/mpolden/remove-legacy-formatMartin Polden2019-08-296-87/+23
| |\ \ \ \ \
| | * | | | | Always use constant for empty statusMartin Polden2019-08-295-7/+11
| | * | | | | Remove legacy serialization format of rotation statusMartin Polden2019-08-294-83/+15
| * | | | | | Merge pull request #10454 from vespa-engine/toregge/block-multiple-load-in-sa...Geir Storli2019-08-295-129/+105
| |\ \ \ \ \ \
| | * | | | | | Block multiple load calls for same attribute vector.Tor Egge2019-08-295-129/+105
| * | | | | | | Merge pull request #10442 from vespa-engine/mpolden/ignore-inactive-lbsMartin Polden2019-08-293-11/+45
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Extract methodMartin Polden2019-08-291-4/+11
| | * | | | | | Ignore inactive load balancers in routing policiesMartin Polden2019-08-273-11/+38
| * | | | | | | Merge pull request #10453 from vespa-engine/hmusum/remove-NonNull-and-Nullabl...Harald Musum2019-08-2944-217/+44
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Remove use of Nullable and NotNull annotationsHarald Musum2019-08-2944-217/+44
| * | | | | | | Merge pull request #10446 from vespa-engine/freva/add-bandwidth-gbpsValerij Fredriksen2019-08-2939-3/+57
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Add bandwidthGbpsValerij Fredriksen2019-08-2839-3/+57
| * | | | | | | Merge pull request #10452 from vespa-engine/revert-10435-revert-10428-revert-...Valerij Fredriksen2019-08-299-37/+40
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Upgrade to zookeeper 3.4.14, take 5"Harald Musum2019-08-299-37/+40
| * | | | | | | | Merge pull request #10450 from vespa-engine/balder/add-support-for-bool-in-ge...Henning Baldersheim2019-08-295-8/+23
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Update testHenning Baldersheim2019-08-291-9/+11