summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use hashmap for faster access.Henning Baldersheim2018-10-2521-160/+255
* 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Export package 'com.yahoo.vespa.athenz.client.zms'Bjørn Christian Seime2018-10-251-0/+8
|/ / / /
* | | | Merge pull request #7444 from vespa-engine/mpolden/controller-aclsMartin Polden2018-10-256-115/+55
|\ \ \ \
| * | | | Update REST API testMartin Polden2018-10-252-42/+19
| * | | | Simplify assertionsMartin Polden2018-10-251-16/+4
| * | | | Remove ACL support for host node typesMartin Polden2018-10-252-70/+6
| * | | | Support ACLs for controllers and hostsMartin Polden2018-10-252-9/+50
| * | | | Remove unused parameterMartin Polden2018-10-252-4/+2
* | | | | Merge pull request #7443 from vespa-engine/mpolden/remove-unused-apiJon Marius Venstad2018-10-253-41/+4
|\ \ \ \ \
| * | | | | Remove unused test responseMartin Polden2018-10-252-8/+1
| * | | | | Remove unused API pathMartin Polden2018-10-252-33/+3
* | | | | | Merge pull request #7440 from vespa-engine/hmusum/avoid-using-static-portHarald Musum2018-10-252-38/+56
|\ \ \ \ \ \
| * | | | | | Use dynamic port in testsHarald Musum2018-10-242-38/+56
* | | | | | | Merge pull request #7418 from vespa-engine/gv/run-tests-in-bootstrapgjoranv2018-10-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Do not skip tests in bootstrap.shgjoranv2018-10-231-1/+1
* | | | | | | | Merge pull request #7445 from vespa-engine/balder/gc-unused-importsJon Bratseth2018-10-253-6/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | GC unused imports.Henning Baldersheim2018-10-253-6/+18
|/ / / / / / /
* | | | | | | Merge pull request #7438 from vespa-engine/bjorncs/g1gcMorten Tokle2018-10-252-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Setting NewRatio is not recommended for G1Bjørn Christian Seime2018-10-242-2/+2