summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.306.39-1].vespa-6.306.39-1by-screwdriver2018-10-314-1/+2
* Merge pull request #7495 from vespa-engine/bjorncs/security-utilsBjørn Christian Seime2018-10-303-17/+46
|\
| * Skip non-key objects (e.g. ec params) when parsing private key from pemBjørn Christian Seime2018-10-301-11/+18
| * Add TransportSecurityOptions.fromJson(String)Bjørn Christian Seime2018-10-302-6/+28
|/
* Merge pull request #7494 from vespa-engine/bratseth/remove-unintended-changeJon Marius Venstad2018-10-301-4/+4
|\
| * Revert unintended changeJon Bratseth2018-10-301-4/+4
|/
* Merge pull request #7492 from vespa-engine/balder/keep-binary-compatibilityJon Bratseth2018-10-302-4/+9
|\
| * Fix javadocJon Bratseth2018-10-302-9/+5
| * Keep binary compatibility.Henning Baldersheim2018-10-301-0/+9
* | Merge pull request #7488 from vespa-engine/freva/fix-rebooterValerij Fredriksen2018-10-301-8/+11
|\ \ | |/ |/|
| * Use EnumSetValerij Fredriksen2018-10-301-2/+2
| * Fix NodeRebooterValerij Fredriksen2018-10-291-8/+11
* | Merge pull request #7490 from vespa-engine/revert-7472-revert-7470-revert-742...Håkon Hallingstad2018-10-3040-733/+391
|\ \
| * | Revert "Revert "Revert "Enforce CC timeouts in Orchestrator 2"""Håkon Hallingstad2018-10-3040-733/+391
|/ /
* | Merge pull request #7475 from vespa-engine/balder/less-temporariesHenning Baldersheim2018-10-291-20/+14
|\ \
| * | Reduce number of temporaries.Henning Baldersheim2018-10-291-20/+14
* | | Merge pull request #7487 from vespa-engine/revert-7482-balder/obey-timeout-tooValerij Fredriksen2018-10-296-23/+10
|\ \ \ | |_|/ |/| |
| * | Revert "Also obey the timeout."Harald Musum2018-10-296-23/+10
|/ /
* | Merge pull request #7485 from vespa-engine/freva/set-right-roleValerij Fredriksen2018-10-291-1/+2
|\ \
| * | Set right roleValerij Fredriksen2018-10-291-1/+2
* | | Merge pull request #7483 from vespa-engine/ollivir/java-dispatch-hitcount-est...Jon Bratseth2018-10-291-8/+13
|\ \ \
| * | | Hitcount estimate support for java dispatcherOlli Virtanen2018-10-291-8/+13
* | | | Merge pull request #7482 from vespa-engine/balder/obey-timeout-tooJon Bratseth2018-10-296-10/+23
|\ \ \ \
| * | | | Also obey the timeout.Henning Baldersheim2018-10-296-10/+23
|/ / / /
* | | | Merge pull request #7480 from vespa-engine/balder/catch-and-abort-on-NullPoin...Henning Baldersheim2018-10-291-0/+3
|\ \ \ \
| * | | | Catch and abort on NullPointerException.Henning Baldersheim2018-10-291-0/+3
|/ / / /
* | | | Merge pull request #7479 from vespa-engine/bjorncs/travisgjoranv2018-10-291-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Increase stack size to fix unstable test in bundle-pluginBjørn Christian Seime2018-10-291-1/+1
|/ / /
* | | Merge pull request #7478 from vespa-engine/mpolden/controllerhost-orchestratorMartin Polden2018-10-294-11/+19
|\ \ \
| * | | Allow controller host to access orchestrator APIMartin Polden2018-10-292-2/+17
| * | | Remove unused methodMartin Polden2018-10-291-7/+0
| * | | Remove unnecessary substring argumentMartin Polden2018-10-291-2/+2
* | | | Merge pull request #7472 from vespa-engine/revert-7470-revert-7424-hakonhall/...Håkon Hallingstad2018-10-2940-391/+733
|\ \ \ \
| * | | | Make RetryingJaxRsStrategy/JaxRsClientFactory backwards compatible for Config...Håkon Hallingstad2018-10-291-1/+1
| * | | | Revert "Revert "Enforce CC timeouts in Orchestrator 2""Håkon Hallingstad2018-10-2940-391/+733
| |/ / /
* | | | Merge pull request #7459 from vespa-engine/hmusum/inject-ZoneHarald Musum2018-10-293-9/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Inject Zone and remove unused methodHarald Musum2018-10-283-9/+3
* | | | Merge pull request #7473 from vespa-engine/hmusum/mount-yinst-tmp-dirHenning Baldersheim2018-10-291-0/+1
|\ \ \ \
| * | | | Mount yinst tmp dirHarald Musum2018-10-291-0/+1
|/ / / /
* | / / Revert "Revert "Olaaun/metric maintaier use api"" (#7469)olaaun2018-10-296-125/+243
| |/ / |/| |
* | | 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