summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add jaxb-core and jaxb-impl dependencies and export their packages.gjoranv2018-07-103-2/+14
| | | | - Needed for Jersey (2.23, and most likely also later versions)
* Update TODO after creating issue to the Felix team.gjoranv2018-07-101-1/+1
|
* Merge pull request #6369 from ↵Arnstein Ressem2018-07-0918-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 Musum2018-07-0918-180/+408
|/
* Merge pull request #6358 from vespa-engine/arnej/allocate-vector-before-useGeir Storli2018-07-093-15/+77
|\ | | | | Arnej/allocate vector before use
| * add unit test for appendPosition()Arne Juul2018-07-091-0/+44
| | | | | | | | * previously this would trigger a bug and crash.
| * refactor to avoid code duplicationArne Juul2018-07-062-25/+19
| | | | | | | | * also minimize diff from original version
| * allocate vector explicitlyArne Juul2018-07-062-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-resilienceBjørn Christian Seime2018-07-0918-408/+180
|\ \ | | | | | | Move NTokenValidator to vespa-athenz + load pub keys from file
| * | Add missing newline at end of fileBjørn Christian Seime2018-07-091-1/+1
| | |
| * | Move NTokenValidator to vespa-athenz + load pub keys from fileBjørn Christian Seime2018-07-0918-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 Bratseth2018-07-0910-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 maintainerHarald Musum2018-07-0910-59/+106
| | |
* | | Merge pull request #6365 from vespa-engine/bjorncs/jdisc-content-size-metricBjørn Christian Seime2018-07-092-1/+7
|\ \ \ | | | | | | | | Use ServletRequestReader to determine bytes consumed
| * | | Use ServletRequestReader to determine bytes consumedBjørn Christian Seime2018-07-092-1/+7
|/ / /
* | | Merge pull request #6356 from vespa-engine/hmusum/configurable-sleepJon Bratseth2018-07-094-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 Musum2018-07-064-4/+10
| | | |
* | | | Merge pull request #6363 from ↵Jon Bratseth2018-07-091-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 immediatelyHarald Musum2018-07-081-20/+28
|/ / /
* | | Merge pull request #6361 from vespa-engine/jvenstad/export-packageHenrik Høiness2018-07-071-0/+7
|\ \ \ | | | | | | | | Export package that was moved
| * | | Export package that was movedJon Marius Venstad2018-07-071-0/+7
|/ / /
* | | Merge pull request #6359 from ↵Jon Bratseth2018-07-066-1/+7
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/gjoranv/deprecate-federation-http-searchers Deprecate HttpSearcher and its subclasses.
| * | | Deprecate HttpSearcher and its subclasses.gjoranv2018-07-066-1/+7
| | | |
* | | | Merge pull request #6357 from vespa-engine/bjorncs/cache-metrics-contextBjørn Christian Seime2018-07-066-45/+30
|\ \ \ \ | | | | | | | | | | Bjorncs/cache metrics context
| * | | | Cache metric context instancesBjørn Christian Seime2018-07-061-14/+17
| | | | |
| * | | | Revert "Add matched binding as dimension when available"Bjørn Christian Seime2018-07-066-35/+16
| | | | | | | | | | | | | | | | | | | | This reverts commit 7c91a519d21689b66680c20af239d0882c7ade8c.
| * | | | Revert "Add comment on use of getBindingMatch"Bjørn Christian Seime2018-07-061-2/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit a355f80c7b9ef596e889eb590bff814e09c5c970.
| * | | | Revert "Temporarily remove binding dimension from http metrics"Bjørn Christian Seime2018-07-061-0/+3
| |/ / / | | | | | | | | | | | | This reverts commit 174fc9c31e31cc0cefb6bde00ca5b816f3d5907d.
* | | | Merge pull request #6335 from vespa-engine/henrhoi/gui-for-sending-requestsHenrik Høiness2018-07-0660-12/+10232
|\ \ \ \ | | | | | | | | | | Henrhoi/gui-for-sending-requests
| * | | | Added Copyrigths and changes a few things for ids on HTMLElementsHenrik2018-07-0616-276/+244
| | | | |
| * | | | Fixed merge conflict with StatusPageProxyHandlerHenrik2018-07-051461-1775/+2698
| |\ \ \ \
| * | | | | ..Henrik2018-07-051-1/+1
| | | | | |
| * | | | | Created new module container-search-gui containing handler for gui for ↵Henrik2018-07-0561-31/+274
| | | | | | | | | | | | | | | | | | | | | | | | building queries. Resources-folder static is now named gui
| * | | | | Small changesHenrik2018-07-041-1/+1
| | | | | |
| * | | | | Added covertion from JSON to URL when selecting different request-methodHenrik2018-07-041-13/+14
| | | | | |
| * | | | | Fixed pasting JSON-query with yqlHenrik2018-07-042-5/+14
| | | | | |
| * | | | | Small changes in search-reference for getting all the correct information by idHenrik2018-07-041-5/+5
| | | | | |
| * | | | | Added information button for every parameter, reading from ↵Henrik2018-07-049-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 ↵Henrik2018-07-0347-0/+11022
| | | | | | | | | | | | | | | | | | | | | | | | handler
* | | | | | Merge pull request #6353 from ↵Arne H Juul2018-07-062-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 Storli2018-07-062-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 Polden2018-07-062-11/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | vespa-engine/hmusum/use-exact-method-parameters-in-method-spec Use exact method parameters in spec
| * | | | | Use exact method parameters in specHarald Musum2018-07-062-11/+12
| | |_|_|/ | |/| | | | | | | | | | | | | Use boolean for flag
* | | | | Merge pull request #6349 from vespa-engine/gjoranv/vagrant-fixesGeir Storli2018-07-061-1/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | Gjoranv/vagrant fixes
| * | | | Use correct version of dev tools and set VESPA_HOME.gjoranv2018-07-061-0/+14
| | | | | | | | | | | | | | | | | | | | - Add VESPA_HOME/bin to PATH
| * | | | Set hostname to 'localhost'.gjoranv2018-07-061-0/+1
| | | | |
| * | | | Install emacs.gjoranv2018-07-061-1/+2
| | | | |
* | | | | Merge pull request #6354 from vespa-engine/bjorncs/export-athenz-config-packageJon Marius Venstad2018-07-061-0/+10
|\ \ \ \ \ | |_|/ / / |/| | | | Export package 'com.yahoo.vespa.hosted.controller.athenz.config'
| * | | | Export package 'com.yahoo.vespa.hosted.controller.athenz.config'Bjørn Christian Seime2018-07-061-0/+10
|/ / / /
* | | | Merge pull request #6347 from vespa-engine/bjorncs/remove-old-zts-clientBjørn Christian Seime2018-07-0612-133/+143
|\ \ \ \ | | | | | | | | | | Bjorncs/remove old zts client