summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Erlend2022-07-291134-24293/+24449
|\
| * Merge pull request #23553 from vespa-engine/bjorncs/upgrade-org-jsonBjørn Christian Seime2022-07-293-3/+3
| |\
| | * Upgrade org.json:json to '20220320'Bjørn Christian Seime2022-07-293-3/+3
| |/
| * Merge pull request #23551 from vespa-engine/junit5-for-flagsBjørn Christian Seime2022-07-299-65/+69
| |\
| | * Convert 'flags' to junit5gjoranv2022-07-289-65/+69
| |/
| * Merge pull request #23549 from vespa-engine/kkraune/readmeValerij Fredriksen2022-07-281-0/+11
| |\
| | * port 3000Kristian Aune2022-07-281-1/+1
| | * Update client/js/app/README.mdKristian Aune2022-07-281-1/+1
| | * Update client/js/app/README.mdKristian Aune2022-07-281-1/+0
| | * Add js app readmeKristian Aune2022-07-281-0/+12
| |/
| * Merge pull request #23548 from vespa-engine/bjorncs/more-junit5Bjørn Christian Seime2022-07-281122-24225/+24366
| |\
| | * Convert node-admin to junit5Bjørn Christian Seime2022-07-2865-943/+972
| | * Convert messagebus to junit5Bjørn Christian Seime2022-07-2840-974/+933
| | * Convert container-core to junit5Bjørn Christian Seime2022-07-2896-2072/+2067
| | * Convert jdisc_core to junit5Bjørn Christian Seime2022-07-2893-1016/+1046
| | * Convert config-model to junit5Bjørn Christian Seime2022-07-28322-6211/+6088
| | * Convert config-provisioning to junit5Bjørn Christian Seime2022-07-2816-169/+191
| | * Convert controller-server to junit5Bjørn Christian Seime2022-07-28118-2973/+3009
| | * Convert controller-api to junit5Bjørn Christian Seime2022-07-289-186/+238
| | * Convert container-search to junit5Bjørn Christian Seime2022-07-28283-8649/+8638
| | * Convert container-disc to junit5Bjørn Christian Seime2022-07-2811-88/+107
| | * Convert clustercontroller-reindexer to junit5Bjørn Christian Seime2022-07-282-1/+15
| | * Convert configserver-flags to junit5Bjørn Christian Seime2022-07-284-46/+66
| | * Convert predicate-search to junit5Bjørn Christian Seime2022-07-2822-223/+246
| | * Convert predicate-search-core to junit5Bjørn Christian Seime2022-07-2823-425/+424
| | * Convert zookeeper-client-commons to junit5Bjørn Christian Seime2022-07-282-7/+12
| | * Convert vespaclient-java to junit5Bjørn Christian Seime2022-07-2812-227/+240
| | * Make testutil compatible with both Junit4 and Junit5Bjørn Christian Seime2022-07-284-15/+74
| * | Merge pull request #23547 from Ethnas/masterValerij Fredriksen2022-07-2815-59/+418
| |\ \
* | | | Spans are now split between invoking and returningErlend2022-07-291-28/+103
| |/ / |/| |
* | | Merge branch 'enikolaisen/querybuilder-js'Erlend2022-07-2815-59/+418
|\ \ \ | |/ / |/| |
| * | Added page for pasting Vespa trace, transforming and downloading traceErlend2022-07-284-8/+29
| * | Small changesErlend2022-07-284-4/+6
| * | Small changeErlend2022-07-281-1/+1
| * | Added ability to download trace from response for use in visualizationErlend2022-07-287-11/+285
| * | Added feedback to CopyResponseButton when clickedErlend2022-07-043-13/+26
| * | Added some commentsErlend2022-07-013-6/+12
| * | Copy response button now copies the response to clipboardErlend2022-07-017-27/+60
| * | Pasting JSON works but the input rows do not reflect itErlend2022-07-012-12/+22
* | | Merge pull request #23546 from vespa-engine/olaa/update-cmr-impactOla Aunrønning2022-07-282-0/+5
|\ \ \ | |_|/ |/| |
| * | Maintainer updates CMR impactOla Aunrønning2022-07-282-0/+5
* | | Merge pull request #23544 from vespa-engine/dont-install-zookeeper-in-metrics...v8.25.9gjoranv2022-07-284-5/+22
|\ \ \
| * | | Don't install zkfacade and zookeeper-server bundles in metrics-proxy.gjoranv2022-07-274-5/+22
* | | | Merge pull request #23542 from vespa-engine/bjormel/perfect-test-namegjoranv2022-07-271-2/+1
|\ \ \ \
| * | | | Rename testBjørn Meland2022-07-271-2/+1
| |/ / /
* | | | Merge pull request #23543 from vespa-engine/bjorncs/junit5Bjørn Christian Seime2022-07-2758-479/+566
|\ \ \ \ | |/ / / |/| | |
| * | | Convert vespa-athenz to junit5Bjørn Christian Seime2022-07-2713-86/+115
| * | | Convert security-tools to junit5Bjørn Christian Seime2022-07-272-16/+21
| * | | Convert hosted-zone-api to junit5Bjørn Christian Seime2022-07-272-11/+22
| * | | Convert jdisc-security-filters to junit5Bjørn Christian Seime2022-07-279-73/+62