summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.157.201-1].vespa-6.157.201-1by-screwdriver2017-10-164-1/+2
* Merge pull request #3746 from vespa-engine/mpolden/freeze-confidenceJon Bratseth2017-10-1514-161/+361
|\
| * Freeze confidence for previous versionsMartin Polden2017-10-137-107/+110
| * Persist version statusMartin Polden2017-10-139-55/+252
* | Merge pull request #3742 from vespa-engine/balder/looking-for-missing-joinHenning Baldersheim2017-10-1317-294/+160
|\ \
| * | Remove leftover code.Henning Baldersheim2017-10-131-1/+0
| * | Remove unused method declaration and allign code.Henning Baldersheim2017-10-131-22/+12
| * | You can only start threads that operates on this in the constructor if you ar...Henning Baldersheim2017-10-133-4/+4
| * | Earlier conclusion about issue with too ealy stop was incorrect. However addi...Henning Baldersheim2017-10-132-6/+9
| * | Put the filereferences in ''Henning Baldersheim2017-10-131-3/+3
| * | Avoid that we miss a stop that happens while we are STARTING.Henning Baldersheim2017-10-132-6/+4
| * | No longer set unused parameterHenning Baldersheim2017-10-131-2/+1
| * | Cleanup while looking for missing join.Henning Baldersheim2017-10-1312-255/+132
* | | Merge pull request #3745 from vespa-engine/vekterli/abort-priority-queued-req...Henning Baldersheim2017-10-133-15/+41
|\ \ \
| * | | Abort priority-queued requests on distributor shutdownTor Brede Vekterli2017-10-133-15/+41
* | | | Merge pull request #3744 from vespa-engine/havardpe/do-not-discard-iteratorsHenning Baldersheim2017-10-133-17/+13
|\ \ \ \
| * | | | do not discard search iteratorsHåvard Pettersen2017-10-133-17/+13
| | |/ / | |/| |
* | | | Merge pull request #3729 from vespa-engine/smorgrav/cost_add_flavor_infoTorbjørn Smørgrav2017-10-1312-28/+180
|\ \ \ \ | |/ / / |/| | |
| * | | Use correct fieldnames in deserialization of flavor infotoby2017-10-132-3/+6
| * | | Spellingtoby2017-10-131-2/+2
| * | | Specify better waste and tco and redefine deployment utilizationtoby2017-10-129-13/+103
| * | | Add more flavor info and redefine cluster tco and wastetoby2017-10-127-13/+68
| * | | Add more javadoc for utilization classestoby2017-10-122-4/+8
* | | | Merge pull request #3740 from vespa-engine/balder/add-format-securityHenning Baldersheim2017-10-1315-217/+113
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid going via temporary.Henning Baldersheim2017-10-132-11/+8
| * | | Prefer static cast over C style castHenning Baldersheim2017-10-131-1/+1
| * | | Code santize based on intellij`s advise. NULL -> nullptr, 0 -> false, dead co...Henning Baldersheim2017-10-123-43/+24
| * | | Allow -Wformat-security + some c++11ification based on Clions advise.Henning Baldersheim2017-10-122-147/+66
| * | | Add missing bracesHenning Baldersheim2017-10-121-2/+3
| * | | Add -Wformat-securityHenning Baldersheim2017-10-129-18/+16
| | |/ | |/|
* | | Merge pull request #3739 from vespa-engine/balder/remove-of-ack-with-metricsTor Egge2017-10-1335-766/+272
|\ \ \ | |/ / |/| |
| * | Avoid using 2 different mechanisms for allowing a only one reply.Henning Baldersheim2017-10-126-19/+14
| * | Get rid of mbus::reply leftovers.Henning Baldersheim2017-10-1211-261/+87
| * | Balance vertical and horisontal bloatHenning Baldersheim2017-10-124-77/+45
| * | Remove the PerDocTypeFeedMetricsHenning Baldersheim2017-10-1226-417/+134
* | | Merge pull request #3738 from vespa-engine/kkraune/ipv4-retire-eu-west-1Kristian Aune2017-10-121-0/+2
|\ \ \
| * | | retire IPv4 hosts in eu-west-1Kristian Aune2017-10-121-0/+2
* | | | Merge pull request #3733 from vespa-engine/hakonhall/avoid-httpexception-on-409Harald Musum2017-10-122-4/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid HttpException on 409Håkon Hallingstad2017-10-122-4/+25
* | | | Merge pull request #3737 from vespa-engine/kkraune/ipv4-retire-northeast-1Valerij Fredriksen2017-10-121-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | retire IPv4 hosts in ap-northeast-1Kristian Aune2017-10-121-0/+2
* | | | Merge pull request #3525 from vespa-engine/vekterli/re-enable-synchronous-set...Tor Brede Vekterli2017-10-1213-23/+205
|\ \ \ \
| * | | | Add configurable deadline for cluster controller tasksTor Brede Vekterli2017-09-2512-16/+153
| * | | | Immediately complete failed remote tasksTor Brede Vekterli2017-09-256-8/+53
* | | | | Merge pull request #3732 from vespa-engine/balder/no-feed-tracingGeir Storli2017-10-128-163/+24
|\ \ \ \ \
| * | | | | No more tracing code that will never be invoked. Nor will the trac enever mak...Henning Baldersheim2017-10-128-157/+18
| * | | | | smartptr->get() != NULL -> (smartptr)Henning Baldersheim2017-10-121-7/+7
* | | | | | Merge pull request #3736 from vespa-engine/vekterli/use-priority-queue-for-ex...Henning Baldersheim2017-10-123-12/+128
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use priority queue for external client operationsTor Brede Vekterli2017-10-123-12/+128
* | | | | | Merge pull request #3735 from vespa-engine/bratseth/shorter-job-timeout-in-cdMartin Polden2017-10-121-1/+4
|\ \ \ \ \ \