summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use final members for thread visibility. And close the InputStream.Henning Baldersheim2019-04-301-30/+40
|
* Merge pull request #9236 from vespa-engine/balder/add-back-configHenning Baldersheim2019-04-301-0/+9
|\ | | | | Add back config fields.
| * Add back config fields.Henning Baldersheim2019-04-301-0/+9
|/
* Merge pull request #9235 from ↵Harald Musum2019-04-309-140/+79
|\ | | | | | | | | vespa-engine/revert-9231-revert-9197-revert-9159-hmusum/fix-config-model-inconsistency-8 Revert "Revert "Revert "Synchronise access to session status of an application, and eliminate…"""
| * Revert "Revert "Revert "Synchronise access to session status of an ↵Harald Musum2019-04-309-140/+79
|/ | | | application, and eliminate…"""
* Merge pull request #9231 from ↵Harald Musum2019-04-309-79/+140
|\ | | | | | | | | vespa-engine/revert-9197-revert-9159-hmusum/fix-config-model-inconsistency-8 Revert "Revert "Synchronise access to session status of an application, and eliminate…""
| * Revert "Revert "Synchronise access to session status of an application, and ↵Jon Marius Venstad2019-04-299-79/+140
| | | | | | | | eliminate…""
* | Merge pull request #9234 from ↵Henning Baldersheim2019-04-292-4/+7
|\ \ | | | | | | | | | | | | vespa-engine/balder/use-a-markable-and-buffered-input-stream Use BufferedInputStream as it buffers and supports make/reset.
| * | Use BufferedInputStream as it buffers and supports make/reset.Henning Baldersheim2019-04-292-4/+7
|/ /
* | Merge pull request #9233 from vespa-engine/bratseth/check-route-explicitlyJon Bratseth2019-04-294-67/+52
|\ \ | |/ |/| Explicitly require non-empty (or null) route
| * Explicitly require non-empty (or null) routeJon Bratseth2019-04-294-67/+52
|/
* Merge pull request #9226 from vespa-engine/ollivir/group-documents-log-fixHenning Baldersheim2019-04-291-2/+2
|\ | | | | Fix document count logging parameters
| * Fix document count logging parametersOlli Virtanen2019-04-291-2/+2
| |
* | Merge pull request #9228 from vespa-engine/balder/mockito-latest-1Henning Baldersheim2019-04-2934-140/+99
|\ \ | | | | | | Use latest mockito 1 series.
| * | no need to ignore testng log files anymore.Henning Baldersheim2019-04-294-6/+0
| | |
| * | Replace use of testng with junitBjørn Christian Seime2019-04-2930-133/+93
| | |
| * | Include junit to work around mockito issueBjørn Christian Seime2019-04-291-0/+5
| | |
| * | Use latest mockito 1 series.Henning Baldersheim2019-04-292-2/+2
| | |
* | | Merge pull request #9227 from vespa-engine/bjorncs/jdisc-fix-loggingBjørn Christian Seime2019-04-291-4/+11
|\ \ \ | | | | | | | | Bjorncs/jdisc fix logging
| * | | Refactor into separate methodBjørn Christian Seime2019-04-291-5/+11
| | | |
| * | | Do not log 404 as warning for 'form-urlencoded' requestsBjørn Christian Seime2019-04-291-0/+1
| | | |
* | | | Merge pull request #9222 from vespa-engine/mortent/add-key-pair-providerAndreas Eriksen2019-04-295-0/+94
|\ \ \ \ | |_|/ / |/| | | Interfaces to support certificate manager
| * | | Interfaces to support certificate managerMorten Tokle2019-04-295-0/+94
| | | |
* | | | Merge pull request #9225 from ↵Bjørn Christian Seime2019-04-297-14/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | vespa-engine/balder/use-mockito-core-over-mockito-all mockito-all => mockito-core
| * | | mockito-all => mockito-coreHenning Baldersheim2019-04-297-14/+6
|/ / /
* | | Merge pull request #9219 from vespa-engine/balder/gc-some-unused-optionsHarald Musum2019-04-2910-274/+17
|\ \ \ | | | | | | | | Balder/gc some unused options
| * | | GC leftovers from /feedapiHenning Baldersheim2019-04-291-1/+0
| | | |
| * | | Reapply what got lost during merge.Henning Baldersheim2019-04-291-4/+0
| | | |
| * | | Merge branch 'master' into balder/gc-some-unused-optionsHenning Baldersheim2019-04-2949-360/+998
| |\ \ \ | | | |/ | | |/|
| * | | FeederConfig is only used internally for legcy vespa-feeder. => GCHenning Baldersheim2019-04-296-132/+4
| | | |
| * | | GC unused configHenning Baldersheim2019-04-297-137/+15
| | | |
* | | | Merge pull request #9210 from ↵Henning Baldersheim2019-04-295-4/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/let-fatal-messagebus-errors-be-reported-as-server-errors Report fatal-mbus-errors-as server error.
| * | | | Test and error code categorization.Henning Baldersheim2019-04-292-2/+39
| | | | |
| * | | | Report fatal-mbus-errors-as server error.Henning Baldersheim2019-04-284-4/+29
| | | | |
* | | | | Merge pull request #9220 from ↵Jon Bratseth2019-04-2912-91/+137
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | vespa-engine/bratseth/document-api-dont-blame-users Bratseth/document api dont blame users
| * | | | Classify errors betterJon Bratseth2019-04-296-23/+29
| | | | |
| * | | | Minor cleanupJon Bratseth2019-04-292-47/+49
| | | | |
| * | | | Revert "Merge pull request #9207 from ↵Jon Bratseth2019-04-295-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-9204-bratseth/document-api-donct-blame-users" This reverts commit 3575ceec65b3787a4f3e412c86479c79cf1d6453, reversing changes made to e535c8fa9c1264d7164fef7f55d10dc585e13e88.
* | | | | Merge pull request #9218 from ↵Martin Polden2019-04-2917-112/+387
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vespa-engine/mpolden/expose-routing-policy-endpoint Add endpoints field for endpoints defined by routing policies
| * | | | Add endpoints field for endpoints defined by routing policiesMartin Polden2019-04-299-23/+280
| | | | |
| * | | | Move deployCompletely to tester classMartin Polden2019-04-293-52/+36
| | | | |
| * | | | Rename endpointsIn -> rotationEndpointsInMartin Polden2019-04-292-3/+3
| | | | |
| * | | | Persist cluster of routing policy instead of DNS aliasMartin Polden2019-04-296-34/+68
| | |_|/ | |/| |
* | | | Merge pull request #9201 from vespa-engine/bratseth/float-tensorJon Bratseth2019-04-2911-116/+445
|\ \ \ \ | | | | | | | | | | Bratseth/float tensor
| * | | | Add a test and correct conditionJon Bratseth2019-04-292-1/+12
| | | | |
| * | | | Add methodsJon Bratseth2019-04-261-0/+2
| | | | |
| * | | | Add float accessorJon Bratseth2019-04-261-0/+10
| | | | |
| * | | | Encode directly as floatJon Bratseth2019-04-264-28/+25
| | | | |
| * | | | Decode directly as floatJon Bratseth2019-04-261-8/+20
| | | | |
| * | | | Build tensors purely with floatsJon Bratseth2019-04-268-21/+169
| | | | |