summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move AthenzPrincipalFilter to jdisc-security-filtersBjørn Christian Seime2018-07-265-86/+85
* Merge pull request #6475 from vespa-engine/balder/random-cleanupHenning Baldersheim2018-07-266-39/+23
|\
| * nested namespacesHenning Baldersheim2018-07-266-39/+23
* | Merge pull request #6470 from vespa-engine/bjorncs/improve-controller-resilienceMorten Tokle2018-07-2618-407/+199
|\ \
| * | Handle zms keys in addition to zts keysBjørn Christian Seime2018-07-255-24/+44
| * | Move NTokenValidator to vespa-athenz + load pub keys from fileBjørn Christian Seime2018-07-2518-408/+180
* | | Merge pull request #6474 from vespa-engine/freva/periodic-maintainer-fixValerij Fredriksen2018-07-263-7/+8
|\ \ \
| * | | Check if redeployment is still needed after acquiring the lockValerij Fredriksen2018-07-263-4/+6
| * | | Use immutable collections insteadValerij Fredriksen2018-07-261-3/+2
* | | | Merge pull request #6473 from vespa-engine/arnej/wait-for-destroyed-processHenning Baldersheim2018-07-261-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | we want to wait until the "du" process is dead, to ensure not starting too ma...Arne Juul2018-07-261-0/+1
|/ / /
* | | Merge pull request #6472 from vespa-engine/gjoranv/enforce-providedKristian Aune2018-07-252-6/+10
|\ \ \
| * | | Exclude guava and slf4j-api in container-coregjoranv2018-07-252-6/+10
|/ / /
* | | Merge pull request #6471 from vespa-engine/gjoranv/slf4j-api-providedBjørn Christian Seime2018-07-251-0/+6
|\ \ \ | |/ / |/| |
| * | Must exclude slf4j from language-detector to avoid compile scope.gjoranv2018-07-251-0/+6
* | | Merge pull request #6468 from vespa-engine/toregge/track-document-db-destructionHenning Baldersheim2018-07-2513-31/+137
|\ \ \
| * | | Track document db destruction.Tor Egge2018-07-2513-31/+137
* | | | Merge pull request #6465 from vespa-engine/balder/nested-namespacesHenning Baldersheim2018-07-2538-243/+101
|\ \ \ \
| * | | | Add missing newline.Henning Baldersheim2018-07-252-2/+2
| * | | | Nested namespacesHenning Baldersheim2018-07-2538-243/+101
| |/ / /
* | | | Merge pull request #6466 from vespa-engine/mortent/pkcs1-encodingBjørn Christian Seime2018-07-252-3/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Write private keys in PKCS#1Morten Tokle2018-07-252-3/+15
| |/ /
* | | Merge pull request #6452 from jefimm/mastergjoranv2018-07-253-2/+61
|\ \ \
| * | | rework dependencies as @gjoranv requestedJefim Matskin2018-07-241-4/+0
| * | | use com.optimaize.langdetect for lang detectionJefim Matskin2018-07-244-2/+65
* | | | Merge pull request #6464 from vespa-engine/gjoranv/attach-bundlegjoranv2018-07-251-23/+3
|\ \ \ \
| * | | | Use new feature in bundle-plugin to attach bundle to artifact.gjoranv2018-07-251-23/+3
|/ / / /
* | | | Merge pull request #6462 from vespa-engine/gjoranv/linguistics-depsgjoranv2018-07-253-0/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Add linguistics dep to modules that use container-dev in compile.gjoranv2018-07-252-0/+14
| * | | Add test dependency for application to get all test depsgjoranv2018-07-251-0/+7
|/ / /
* | | Merge pull request #6461 from vespa-engine/gjoranv/export-opennlp-apigjoranv2018-07-241-0/+5
|\ \ \ | |/ / |/| |
| * | Export package com.yahoo.language.opennlp.gjoranv2018-07-241-0/+5
|/ /
* | Merge pull request #6460 from vespa-engine/gjoranv/exclude-language-detectorgjoranv2018-07-242-0/+15
|\ \
| * | Exclude langauge-detector from container-devgjoranv2018-07-242-0/+15
|/ /
* | Merge pull request #6459 from vespa-engine/gjoranv/todo-bundle-versionBjørn Christian Seime2018-07-241-2/+2
|\ \
| * | Add TODO to evaluate Bundle-Version for Vespa 7.gjoranv2018-07-241-2/+2
|/ /
* | Merge pull request #6456 from vespa-engine/bjorncs/export-metricsgjoranv2018-07-241-0/+4
|\ \
| * | Export 'jdisc.http.request.uri_length/content_size' metricsBjørn Christian Seime2018-07-241-0/+4
* | | Merge pull request #6458 from vespa-engine/balder/no-dynamic_cast-in-inner-loopHenning Baldersheim2018-07-249-53/+26
|\ \ \
| * | | Use static cast in inner loop.Henning Baldersheim2018-07-241-1/+1
| * | | - NULL -> nullptrHenning Baldersheim2018-07-249-52/+25
| |/ /
* | | Merge pull request #6457 from vespa-engine/arnej/avoid-busy-loopHenning Baldersheim2018-07-242-10/+22
|\ \ \ | |/ / |/| |
| * | reorder to increase chances of information in stack dumpArne Juul2018-07-241-10/+19
| * | busy looping is badArne Juul2018-07-241-0/+3
* | | Merge pull request #6450 from vespa-engine/gjoranv/attach-bundlegjoranv2018-07-241-0/+18
|\ \ \
| * | | Add option to attach the bundle to the artifact.gjoranv2018-07-231-0/+18
* | | | Merge pull request #6454 from vespa-engine/freva/tenant-pipelines-apiValerij Fredriksen2018-07-2411-22/+651
|\ \ \ \
| * | | | Improve error messagesValerij Fredriksen2018-07-241-2/+4
| * | | | Added testsValerij Fredriksen2018-07-244-0/+436
| * | | | Update SubmitOptions to match SourceRevisionValerij Fredriksen2018-07-241-13/+13