summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.305.35-1].vespa-6.305.35-1by-screwdriver2018-10-294-1/+2
* Merge pull request #7464 from vespa-engine/balder/remove-deprecated-usageHenning Baldersheim2018-10-266-24/+71
|\
| * Follow up code comments from @vekterliHenning Baldersheim2018-10-263-10/+6
| * Remove use of deprecated methods.Henning Baldersheim2018-10-263-14/+65
|/
* Merge pull request #7463 from vespa-engine/balder/put-back-public-apiHenning Baldersheim2018-10-262-12/+12
|\
| * Does not throw anymore.Henning Baldersheim2018-10-261-3/+3
| * Does not throw anymore.Henning Baldersheim2018-10-261-3/+3
| * Reinstate old visibility since imagesearch are using non-public apis.Henning Baldersheim2018-10-261-10/+10
|/
* Revert "Olaaun/metric maintaier use api (#7402)" (#7461)olaaun2018-10-266-188/+126
* Merge pull request #7458 from vespa-engine/balder/produce-start-config-in-con...Henning Baldersheim2018-10-266-44/+36
|\
| * Refactor: Move qrstart config generation from ContainerSearh to ContainerClus...Henning Baldersheim2018-10-266-44/+36
* | Olaaun/metric maintaier use api (#7402)olaaun2018-10-266-126/+188
|/
* Merge pull request #7454 from vespa-engine/jvenstad/batch-log-calls-to-ZKHarald Musum2018-10-262-16/+34
|\
| * Batch log calls that go to ZK when trivialJon Marius Venstad2018-10-252-16/+34
* | Merge pull request #7456 from vespa-engine/balder/deprecate-old-api-update-apiHenning Baldersheim2018-10-2520-163/+252
|\ \
| * | Only deprecate the badly scaling methods.Henning Baldersheim2018-10-252-44/+38
| * | Use hashmap for faster access.Henning Baldersheim2018-10-2521-160/+255
| |/
* | Merge pull request #7455 from vespa-engine/balder/also-detect-cms-argsJon Bratseth2018-10-252-4/+3
|\ \ | |/ |/|
| * Also detect cms argsHenning Baldersheim2018-10-252-4/+3
|/
* Merge pull request #7452 from vespa-engine/bjorncs/athenz-okta-tenancyBjørn Christian Seime2018-10-253-42/+11
|\
| * Cleanup vespa-athenz pom.xmlBjørn Christian Seime2018-10-251-34/+2
| * Don't parse entity for responses without contentBjørn Christian Seime2018-10-252-8/+9
* | Merge pull request #7451 from vespa-engine/freva/fix-metricsValerij Fredriksen2018-10-254-139/+329
|\ \
| * | Fix metricsValerij Fredriksen2018-10-253-135/+322
| * | Remove trailing spaceValerij Fredriksen2018-10-252-4/+7
* | | Merge pull request #7450 from vespa-engine/jvenstad/log-adjustmentsJon Marius Venstad2018-10-253-5/+4
|\ \ \
| * | | Sort chunk ids by numerical orderJon Marius Venstad2018-10-251-1/+2
| * | | Use smaller chunks for logs to reduce ZK traffic (just in case)Jon Marius Venstad2018-10-251-1/+1
| * | | Indicate application, job and step in Vespa log (always the intention)Jon Marius Venstad2018-10-251-3/+1
* | | | Merge pull request #7449 from vespa-engine/balder/cms-occupancy-fractionHenning Baldersheim2018-10-2512-36/+160
|\ \ \ \
| * | | | Since this is a replacement no need to turn off UseConcMarkSweepGCHenning Baldersheim2018-10-251-1/+1
| * | | | Let the fallback be the old default.Henning Baldersheim2018-10-251-1/+1
| * | | | Detect conflicting jvmargs.Henning Baldersheim2018-10-252-2/+58
| * | | | If System name is dev enable G1GCHenning Baldersheim2018-10-253-17/+29
| * | | | Add support for controlling gcopts in services.xmlHenning Baldersheim2018-10-257-41/+53
| * | | | Control gcopts from model.Henning Baldersheim2018-10-254-0/+44
| * | | | Expect gcopts in configHenning Baldersheim2018-10-251-1/+1
| * | | | Specify default GC arguments as default in config.Henning Baldersheim2018-10-251-1/+1
| |/ / /
* | | | Merge pull request #7433 from vespa-engine/ollivir/dispatch-distribution-fixesOlli Virtanen2018-10-2510-114/+235
|\ \ \ \
| * | | | Indentation & javadoc improvementsOlli Virtanen2018-10-252-7/+20
| * | | | Take group temporarily out of rotation on connection errorOlli Virtanen2018-10-242-0/+5
| * | | | Field visibility correctionOlli Virtanen2018-10-241-3/+3
| * | | | Pull more configuration parameters from config model to internal dispatcher c...Olli Virtanen2018-10-247-49/+114
| * | | | Test connection to content node before committing to using itOlli Virtanen2018-10-224-60/+86
| * | | | Strict group ordering in round-robin; corrected comparison of group coveragesOlli Virtanen2018-10-222-6/+18
* | | | | Merge pull request #7447 from vespa-engine/mpolden/pr-instance-cleanupJon Bratseth2018-10-2518-162/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove obsolete testMartin Polden2018-10-252-42/+0
| * | | | Remove obsolete filterMartin Polden2018-10-2512-28/+6
| * | | | Revert "Remove PR instances"Martin Polden2018-10-254-92/+0
* | | | | Merge pull request #7448 from vespa-engine/bjorncs/fixMorten Tokle2018-10-251-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |