summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17140 from vespa-engine/gjoranv/merge-http-into-core_rebasedgjoranv2021-03-25207-1959/+1657
|\
| * Add missing whitespace.gjoranv2021-03-241-1/+1
| * Remove the jdisc_http_service module.gjoranv2021-03-23172-20598/+4
| * Fix raw usage of ContainerCluster in unit test.gjoranv2021-03-231-3/+3
| * Update all component specs to use the container-disc bundlegjoranv2021-03-2311-28/+19
| * Update class comment.gjoranv2021-03-231-2/+1
| * Remove jdisc_http_service, chain and processing from Code-map.gjoranv2021-03-231-4/+1
| * Do not build or install the jdisc_http_service module.gjoranv2021-03-233-3/+0
| * Do not install the jdisc_http_service bundle.gjoranv2021-03-231-1/+0
| * Remove all dependencies to jdisc_http_servicegjoranv2021-03-2313-71/+1
| * Install bouncycastle dependency jars.gjoranv2021-03-231-0/+1
| * Update abi spec after merging in jdisc_http_service.gjoranv2021-03-231-0/+1480
| * Copy plugin configuration from jdisc_http_service.gjoranv2021-03-231-0/+16
| * Add preinstall bundles from jdisc_http_service to container-disc.gjoranv2021-03-231-0/+13
| * Add necessary test deps from jdisc_http_service.gjoranv2021-03-231-6/+36
| * Add test java source files from jdisc_http_service.gjoranv2021-03-2345-0/+7032
| * Add main java source from jdisc_http_service.gjoranv2021-03-23113-0/+11601
| * Add dependencies required by jdisc_http_servicegjoranv2021-03-231-0/+11
| * Explicitly add dependencies used by this module.gjoranv2021-03-231-0/+23
| * Rearrange deps, no functional changes.gjoranv2021-03-231-54/+54
| * Remove the container-core-config module.gjoranv2021-03-2310-96/+0
| * Add config defs from jdisc_http_service and container-core-configgjoranv2021-03-236-0/+268
* | Merge pull request #17163 from vespa-engine/revert-17158-revert-17085-hakonha...Håkon Hallingstad2021-03-2414-18/+75
|\ \
| * | Make default deadline to first broadcast 30sHåkon Hallingstad2021-03-245-24/+13
| * | Revert "Revert "Avoid safe mutations in master moratorium and increase first ...Håkon Hallingstad2021-03-2415-22/+90
* | | Merge pull request #17166 from vespa-engine/revert-17157-revert-17144-revert-...Bjørn Christian Seime2021-03-245-283/+322
|\ \ \ | |/ / |/| |
| * | Revert "Revert "Revert "Bjorncs/convert state ressources to request handler""...Bjørn Christian Seime2021-03-245-283/+322
|/ /
* | Merge pull request #17157 from vespa-engine/revert-17144-revert-17126-bjorncs...Bjørn Christian Seime2021-03-245-322/+283
|\ \
| * | ConfigServerLocation component is removedBjørn Christian Seime2021-03-241-2/+0
| * | Revert "Revert "Bjorncs/convert state ressources to request handler""Bjørn Christian Seime2021-03-245-320/+283
* | | Merge pull request #17150 from vespa-engine/havardpe/use-new-macrosHåvard Pettersen2021-03-242-10/+11
|\ \ \
| * | | use REQUIRE for sanity checksHåvard Pettersen2021-03-242-10/+11
* | | | Merge pull request #17159 from vespa-engine/hmusum/add-feature-flag-for-waiti...Jon Marius Venstad2021-03-242-6/+22
|\ \ \ \
| * | | | Add feature flag for when to wait for all config servers when deleting applic...Harald Musum2021-03-242-6/+22
| | |/ / | |/| |
* | | | Merge pull request #17156 from vespa-engine/bjorncs/commons-loggingBjørn Christian Seime2021-03-243-3/+3
|\ \ \ \
| * | | | Match commons-logging version with packages provided by jcl-over-slf4jBjørn Christian Seime2021-03-243-3/+3
| |/ / /
* | | | Merge pull request #17158 from vespa-engine/revert-17085-hakonhall/increase-t...Håkon Hallingstad2021-03-2415-90/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Avoid safe mutations in master moratorium and increase first cluster ...Håkon Hallingstad2021-03-2415-90/+22
|/ / /
* | | Merge pull request #17154 from vespa-engine/hmusum/wait-all-servers-when-dele...Harald Musum2021-03-242-14/+185
|\ \ \
| * | | Try to wait for all nodes to complete barrier when deleting applicationHarald Musum2021-03-242-14/+185
* | | | Merge pull request #17085 from vespa-engine/hakonhall/increase-the-minimum-ti...Håkon Hallingstad2021-03-2415-22/+90
|\ \ \ \
| * | | | Avoid safe-set-node-state in master moratoriumHåkon Hallingstad2021-03-2412-16/+68
| * | | | Increase the minimum time before first cluster state broadcast [run-systemtest]Håkon Hallingstad2021-03-193-6/+22
* | | | | Merge pull request #17147 from vespa-engine/bratseth/application-statsValerij Fredriksen2021-03-2420-221/+311
|\ \ \ \ \
| * | | | | RefactorJon Bratseth2021-03-243-42/+0
| * | | | | RefactorJon Bratseth2021-03-2410-39/+31
| * | | | | RefactorJon Bratseth2021-03-241-2/+2
| * | | | | RefactorJon Bratseth2021-03-246-53/+31
| * | | | | RefactorJon Bratseth2021-03-249-39/+36
| * | | | | RefactorJon Bratseth2021-03-243-16/+22