summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Enforce CC timeouts in Orchestrator 2""Håkon Hallingstad2018-10-2940-391/+733
* Merge pull request #7470 from vespa-engine/revert-7424-hakonhall/enforce-cc-t...Håkon Hallingstad2018-10-2940-733/+391
|\
| * Revert "Enforce CC timeouts in Orchestrator 2"Håkon Hallingstad2018-10-2940-733/+391
|/
* Merge pull request #7468 from vespa-engine/hmusum/add-config-option-to-throw-...Harald Musum2018-10-293-61/+117
|\
| * Add config option throwIfBootstrappingTenantRepoFailsHarald Musum2018-10-283-38/+97
| * Cleanup tests a bitHarald Musum2018-10-281-23/+20
* | Merge pull request #7465 from vespa-engine/freva/move-nasuValerij Fredriksen2018-10-2912-639/+387
|\ \
| * | Rename to NASUValerij Fredriksen2018-10-264-22/+22
| * | Remove unused interfacesValerij Fredriksen2018-10-262-46/+0
| * | Remove Thread from NASUValerij Fredriksen2018-10-264-286/+138
| * | Remove debug infoValerij Fredriksen2018-10-266-59/+1
* | | Merge pull request #7460 from vespa-engine/freva/increase-lz4-timeoutValerij Fredriksen2018-10-292-2/+13
|\ \ \
| * | | Coredump fixesValerij Fredriksen2018-10-262-2/+13
* | | | Merge pull request #7424 from vespa-engine/hakonhall/enforce-cc-timeouts-in-o...Håkon Hallingstad2018-10-2940-391/+733
|\ \ \ \
| * | | | Remove override method no longer in the APIHåkon Hallingstad2018-10-261-5/+0
| * | | | Merge branch 'master' into hakonhall/enforce-cc-timeouts-in-orchestrator-2Håkon Hallingstad2018-10-26251-3874/+5641
| |\ \ \ \
| * | | | | Fixes after review roundHåkon Hallingstad2018-10-269-43/+39
| * | | | | set-node-state probing in CCHåkon Hallingstad2018-10-248-24/+76
| * | | | | Enforce CC timeouts in Orchestrator 2Håkon Hallingstad2018-10-2331-362/+661
* | | | | | Merge pull request #7467 from vespa-engine/revert-7466-revert-7462-jvenstad/s...Valerij Fredriksen2018-10-283-3/+41
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Revert "Revert "Start controller maintainers with fixed spacing""Jon Marius Venstad2018-10-283-3/+41
* | | | | | Merge pull request #7457 from vespa-engine/freva/convert-to-string-firstValerij Fredriksen2018-10-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Convert to String firstValerij Fredriksen2018-10-261-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #7466 from vespa-engine/revert-7462-jvenstad/stagger-maint...Jon Marius Venstad2018-10-283-41/+3
|\ \ \ \ \
| * | | | | Revert "Start controller maintainers with fixed spacing"Jon Marius Venstad2018-10-283-41/+3
|/ / / / /
* | | | | Merge pull request #7462 from vespa-engine/jvenstad/stagger-maintenance-evenlyJon Marius Venstad2018-10-283-3/+41
|\ \ \ \ \
| * | | | | Test and fixJon Marius Venstad2018-10-262-6/+30
| * | | | | Validate interval, tolerate cluster without this, clean up testJon Marius Venstad2018-10-262-10/+11
| * | | | | Increase interval of costly maintainers to compensateJon Marius Venstad2018-10-261-2/+2
| * | | | | Start controller maintainers with fixed spacingJon Marius Venstad2018-10-262-1/+14
| | |_|/ / | |/| | |
* | | | | 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