Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use final members for thread visibility. And close the InputStream. | Henning Baldersheim | 2019-04-30 | 1 | -30/+40 |
| | |||||
* | Merge pull request #9236 from vespa-engine/balder/add-back-config | Henning Baldersheim | 2019-04-30 | 1 | -0/+9 |
|\ | | | | | Add back config fields. | ||||
| * | Add back config fields. | Henning Baldersheim | 2019-04-30 | 1 | -0/+9 |
|/ | |||||
* | Merge pull request #9235 from ↵ | Harald Musum | 2019-04-30 | 9 | -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 Musum | 2019-04-30 | 9 | -140/+79 |
|/ | | | | application, and eliminate…""" | ||||
* | Merge pull request #9231 from ↵ | Harald Musum | 2019-04-30 | 9 | -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 Venstad | 2019-04-29 | 9 | -79/+140 |
| | | | | | | | | eliminate…"" | ||||
* | | Merge pull request #9234 from ↵ | Henning Baldersheim | 2019-04-29 | 2 | -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 Baldersheim | 2019-04-29 | 2 | -4/+7 |
|/ / | |||||
* | | Merge pull request #9233 from vespa-engine/bratseth/check-route-explicitly | Jon Bratseth | 2019-04-29 | 4 | -67/+52 |
|\ \ | |/ |/| | Explicitly require non-empty (or null) route | ||||
| * | Explicitly require non-empty (or null) route | Jon Bratseth | 2019-04-29 | 4 | -67/+52 |
|/ | |||||
* | Merge pull request #9226 from vespa-engine/ollivir/group-documents-log-fix | Henning Baldersheim | 2019-04-29 | 1 | -2/+2 |
|\ | | | | | Fix document count logging parameters | ||||
| * | Fix document count logging parameters | Olli Virtanen | 2019-04-29 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #9228 from vespa-engine/balder/mockito-latest-1 | Henning Baldersheim | 2019-04-29 | 34 | -140/+99 |
|\ \ | | | | | | | Use latest mockito 1 series. | ||||
| * | | no need to ignore testng log files anymore. | Henning Baldersheim | 2019-04-29 | 4 | -6/+0 |
| | | | |||||
| * | | Replace use of testng with junit | Bjørn Christian Seime | 2019-04-29 | 30 | -133/+93 |
| | | | |||||
| * | | Include junit to work around mockito issue | Bjørn Christian Seime | 2019-04-29 | 1 | -0/+5 |
| | | | |||||
| * | | Use latest mockito 1 series. | Henning Baldersheim | 2019-04-29 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #9227 from vespa-engine/bjorncs/jdisc-fix-logging | Bjørn Christian Seime | 2019-04-29 | 1 | -4/+11 |
|\ \ \ | | | | | | | | | Bjorncs/jdisc fix logging | ||||
| * | | | Refactor into separate method | Bjørn Christian Seime | 2019-04-29 | 1 | -5/+11 |
| | | | | |||||
| * | | | Do not log 404 as warning for 'form-urlencoded' requests | Bjørn Christian Seime | 2019-04-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #9222 from vespa-engine/mortent/add-key-pair-provider | Andreas Eriksen | 2019-04-29 | 5 | -0/+94 |
|\ \ \ \ | |_|/ / |/| | | | Interfaces to support certificate manager | ||||
| * | | | Interfaces to support certificate manager | Morten Tokle | 2019-04-29 | 5 | -0/+94 |
| | | | | |||||
* | | | | Merge pull request #9225 from ↵ | Bjørn Christian Seime | 2019-04-29 | 7 | -14/+6 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | vespa-engine/balder/use-mockito-core-over-mockito-all mockito-all => mockito-core | ||||
| * | | | mockito-all => mockito-core | Henning Baldersheim | 2019-04-29 | 7 | -14/+6 |
|/ / / | |||||
* | | | Merge pull request #9219 from vespa-engine/balder/gc-some-unused-options | Harald Musum | 2019-04-29 | 10 | -274/+17 |
|\ \ \ | | | | | | | | | Balder/gc some unused options | ||||
| * | | | GC leftovers from /feedapi | Henning Baldersheim | 2019-04-29 | 1 | -1/+0 |
| | | | | |||||
| * | | | Reapply what got lost during merge. | Henning Baldersheim | 2019-04-29 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into balder/gc-some-unused-options | Henning Baldersheim | 2019-04-29 | 49 | -360/+998 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | FeederConfig is only used internally for legcy vespa-feeder. => GC | Henning Baldersheim | 2019-04-29 | 6 | -132/+4 |
| | | | | |||||
| * | | | GC unused config | Henning Baldersheim | 2019-04-29 | 7 | -137/+15 |
| | | | | |||||
* | | | | Merge pull request #9210 from ↵ | Henning Baldersheim | 2019-04-29 | 5 | -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 Baldersheim | 2019-04-29 | 2 | -2/+39 |
| | | | | | |||||
| * | | | | Report fatal-mbus-errors-as server error. | Henning Baldersheim | 2019-04-28 | 4 | -4/+29 |
| | | | | | |||||
* | | | | | Merge pull request #9220 from ↵ | Jon Bratseth | 2019-04-29 | 12 | -91/+137 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | vespa-engine/bratseth/document-api-dont-blame-users Bratseth/document api dont blame users | ||||
| * | | | | Classify errors better | Jon Bratseth | 2019-04-29 | 6 | -23/+29 |
| | | | | | |||||
| * | | | | Minor cleanup | Jon Bratseth | 2019-04-29 | 2 | -47/+49 |
| | | | | | |||||
| * | | | | Revert "Merge pull request #9207 from ↵ | Jon Bratseth | 2019-04-29 | 5 | -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 Polden | 2019-04-29 | 17 | -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 policies | Martin Polden | 2019-04-29 | 9 | -23/+280 |
| | | | | | |||||
| * | | | | Move deployCompletely to tester class | Martin Polden | 2019-04-29 | 3 | -52/+36 |
| | | | | | |||||
| * | | | | Rename endpointsIn -> rotationEndpointsIn | Martin Polden | 2019-04-29 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Persist cluster of routing policy instead of DNS alias | Martin Polden | 2019-04-29 | 6 | -34/+68 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #9201 from vespa-engine/bratseth/float-tensor | Jon Bratseth | 2019-04-29 | 11 | -116/+445 |
|\ \ \ \ | | | | | | | | | | | Bratseth/float tensor | ||||
| * | | | | Add a test and correct condition | Jon Bratseth | 2019-04-29 | 2 | -1/+12 |
| | | | | | |||||
| * | | | | Add methods | Jon Bratseth | 2019-04-26 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Add float accessor | Jon Bratseth | 2019-04-26 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Encode directly as float | Jon Bratseth | 2019-04-26 | 4 | -28/+25 |
| | | | | | |||||
| * | | | | Decode directly as float | Jon Bratseth | 2019-04-26 | 1 | -8/+20 |
| | | | | | |||||
| * | | | | Build tensors purely with floats | Jon Bratseth | 2019-04-26 | 8 | -21/+169 |
| | | | | |