Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add jaxb-core and jaxb-impl dependencies and export their packages. | gjoranv | 2018-07-10 | 3 | -2/+14 |
| | | | | - Needed for Jersey (2.23, and most likely also later versions) | ||||
* | Update TODO after creating issue to the Felix team. | gjoranv | 2018-07-10 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6369 from ↵ | Arnstein Ressem | 2018-07-09 | 18 | -180/+408 |
|\ | | | | | | | | | vespa-engine/revert-6367-bjorncs/improve-controller-resilience Revert "Move NTokenValidator to vespa-athenz + load pub keys from file" | ||||
| * | Revert "Move NTokenValidator to vespa-athenz + load pub keys from file" | Harald Musum | 2018-07-09 | 18 | -180/+408 |
|/ | |||||
* | Merge pull request #6358 from vespa-engine/arnej/allocate-vector-before-use | Geir Storli | 2018-07-09 | 3 | -15/+77 |
|\ | | | | | Arnej/allocate vector before use | ||||
| * | add unit test for appendPosition() | Arne Juul | 2018-07-09 | 1 | -0/+44 |
| | | | | | | | | * previously this would trigger a bug and crash. | ||||
| * | refactor to avoid code duplication | Arne Juul | 2018-07-06 | 2 | -25/+19 |
| | | | | | | | | * also minimize diff from original version | ||||
| * | allocate vector explicitly | Arne Juul | 2018-07-06 | 2 | -19/+43 |
| | | | | | | | | | | | | | | | | * when appending a position, the old version would call appendToAllocatedVector() even in cases where no vector had already been allocated. That routine then accessed a union to get old size, accessing some random data that would mostly be 0 by accident. | ||||
* | | Merge pull request #6367 from vespa-engine/bjorncs/improve-controller-resilience | Bjørn Christian Seime | 2018-07-09 | 18 | -408/+180 |
|\ \ | | | | | | | Move NTokenValidator to vespa-athenz + load pub keys from file | ||||
| * | | Add missing newline at end of file | Bjørn Christian Seime | 2018-07-09 | 1 | -1/+1 |
| | | | |||||
| * | | Move NTokenValidator to vespa-athenz + load pub keys from file | Bjørn Christian Seime | 2018-07-09 | 18 | -408/+180 |
|/ / | | | | | | | | | | | | | - Move NTokenValidator from controller-server to vespa-athenz - Remodel ZmsKeystore as AthenzTruststore - Use file-backed truststore on controller (replaces download of public keys) - Remove ZmsClient.getPublicKey/getPublicKeys | ||||
* | | Merge pull request #6364 from ↵ | Jon Bratseth | 2018-07-09 | 10 | -59/+106 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/delete-inactive-sessions-in-maintainer Move deletion of inactive sessions to a maintainer | ||||
| * | | Move deletion of inactive sessions to a maintainer | Harald Musum | 2018-07-09 | 10 | -59/+106 |
| | | | |||||
* | | | Merge pull request #6365 from vespa-engine/bjorncs/jdisc-content-size-metric | Bjørn Christian Seime | 2018-07-09 | 2 | -1/+7 |
|\ \ \ | | | | | | | | | Use ServletRequestReader to determine bytes consumed | ||||
| * | | | Use ServletRequestReader to determine bytes consumed | Bjørn Christian Seime | 2018-07-09 | 2 | -1/+7 |
|/ / / | |||||
* | | | Merge pull request #6356 from vespa-engine/hmusum/configurable-sleep | Jon Bratseth | 2018-07-09 | 4 | -4/+10 |
|\ \ \ | | | | | | | | | Make sleep time configurable (avoid spending a long time in unit tests) | ||||
| * | | | Make sleep time configurable (avoid spending a long time in unit tests) | Harald Musum | 2018-07-06 | 4 | -4/+10 |
| | | | | |||||
* | | | | Merge pull request #6363 from ↵ | Jon Bratseth | 2018-07-09 | 1 | -20/+28 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | vespa-engine/hmusum/serve-file-if-file-was-downloaded If we manage to download file, make sure to serve file immediately | ||||
| * | | | If we manage to download file, make sure to serve file immediately | Harald Musum | 2018-07-08 | 1 | -20/+28 |
|/ / / | |||||
* | | | Merge pull request #6361 from vespa-engine/jvenstad/export-package | Henrik Høiness | 2018-07-07 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | Export package that was moved | ||||
| * | | | Export package that was moved | Jon Marius Venstad | 2018-07-07 | 1 | -0/+7 |
|/ / / | |||||
* | | | Merge pull request #6359 from ↵ | Jon Bratseth | 2018-07-06 | 6 | -1/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/gjoranv/deprecate-federation-http-searchers Deprecate HttpSearcher and its subclasses. | ||||
| * | | | Deprecate HttpSearcher and its subclasses. | gjoranv | 2018-07-06 | 6 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #6357 from vespa-engine/bjorncs/cache-metrics-context | Bjørn Christian Seime | 2018-07-06 | 6 | -45/+30 |
|\ \ \ \ | | | | | | | | | | | Bjorncs/cache metrics context | ||||
| * | | | | Cache metric context instances | Bjørn Christian Seime | 2018-07-06 | 1 | -14/+17 |
| | | | | | |||||
| * | | | | Revert "Add matched binding as dimension when available" | Bjørn Christian Seime | 2018-07-06 | 6 | -35/+16 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 7c91a519d21689b66680c20af239d0882c7ade8c. | ||||
| * | | | | Revert "Add comment on use of getBindingMatch" | Bjørn Christian Seime | 2018-07-06 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit a355f80c7b9ef596e889eb590bff814e09c5c970. | ||||
| * | | | | Revert "Temporarily remove binding dimension from http metrics" | Bjørn Christian Seime | 2018-07-06 | 1 | -0/+3 |
| |/ / / | | | | | | | | | | | | | This reverts commit 174fc9c31e31cc0cefb6bde00ca5b816f3d5907d. | ||||
* | | | | Merge pull request #6335 from vespa-engine/henrhoi/gui-for-sending-requests | Henrik Høiness | 2018-07-06 | 60 | -12/+10232 |
|\ \ \ \ | | | | | | | | | | | Henrhoi/gui-for-sending-requests | ||||
| * | | | | Added Copyrigths and changes a few things for ids on HTMLElements | Henrik | 2018-07-06 | 16 | -276/+244 |
| | | | | | |||||
| * | | | | Fixed merge conflict with StatusPageProxyHandler | Henrik | 2018-07-05 | 1461 | -1775/+2698 |
| |\ \ \ \ | |||||
| * | | | | | .. | Henrik | 2018-07-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Created new module container-search-gui containing handler for gui for ↵ | Henrik | 2018-07-05 | 61 | -31/+274 |
| | | | | | | | | | | | | | | | | | | | | | | | | building queries. Resources-folder static is now named gui | ||||
| * | | | | | Small changes | Henrik | 2018-07-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Added covertion from JSON to URL when selecting different request-method | Henrik | 2018-07-04 | 1 | -13/+14 |
| | | | | | | |||||
| * | | | | | Fixed pasting JSON-query with yql | Henrik | 2018-07-04 | 2 | -5/+14 |
| | | | | | | |||||
| * | | | | | Small changes in search-reference for getting all the correct information by id | Henrik | 2018-07-04 | 1 | -5/+5 |
| | | | | | | |||||
| * | | | | | Added information button for every parameter, reading from ↵ | Henrik | 2018-07-04 | 9 | -1101/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | search-api-reference from docs. Also tried to remove unused code | ||||
| * | | | | | Added webpage-project for building queries and handler, as well as tests for ↵ | Henrik | 2018-07-03 | 47 | -0/+11022 |
| | | | | | | | | | | | | | | | | | | | | | | | | handler | ||||
* | | | | | | Merge pull request #6353 from ↵ | Arne H Juul | 2018-07-06 | 2 | -4/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/geirst/fix-assign-null-json-operation-for-position-fields Use default long field value instead of null when position field is n… | ||||
| * | | | | | | Use default long field value instead of null when position field is not ↵ | Geir Storli | 2018-07-06 | 2 | -4/+8 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete. This ensures the same handling as regular attribute fields when clearing a field with an "assign: null" json update operation. | ||||
* | | | | | | Merge pull request #6355 from ↵ | Martin Polden | 2018-07-06 | 2 | -11/+12 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | vespa-engine/hmusum/use-exact-method-parameters-in-method-spec Use exact method parameters in spec | ||||
| * | | | | | Use exact method parameters in spec | Harald Musum | 2018-07-06 | 2 | -11/+12 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Use boolean for flag | ||||
* | | | | | Merge pull request #6349 from vespa-engine/gjoranv/vagrant-fixes | Geir Storli | 2018-07-06 | 1 | -1/+17 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Gjoranv/vagrant fixes | ||||
| * | | | | Use correct version of dev tools and set VESPA_HOME. | gjoranv | 2018-07-06 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | - Add VESPA_HOME/bin to PATH | ||||
| * | | | | Set hostname to 'localhost'. | gjoranv | 2018-07-06 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Install emacs. | gjoranv | 2018-07-06 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #6354 from vespa-engine/bjorncs/export-athenz-config-package | Jon Marius Venstad | 2018-07-06 | 1 | -0/+10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Export package 'com.yahoo.vespa.hosted.controller.athenz.config' | ||||
| * | | | | Export package 'com.yahoo.vespa.hosted.controller.athenz.config' | Bjørn Christian Seime | 2018-07-06 | 1 | -0/+10 |
|/ / / / | |||||
* | | | | Merge pull request #6347 from vespa-engine/bjorncs/remove-old-zts-client | Bjørn Christian Seime | 2018-07-06 | 12 | -133/+143 |
|\ \ \ \ | | | | | | | | | | | Bjorncs/remove old zts client |