summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Less use of ContainerJon Bratseth2018-12-037-18/+20
* Merge pull request #7855 from vespa-engine/balder/close-cryptoengineJon Bratseth2018-12-034-3/+18
|\
| * Close the cryptoengine in order to get to close the tls context.Henning Baldersheim2018-12-034-3/+18
* | Merge pull request #7854 from vespa-engine/ollivir/java-dispatch-merging-move...Jon Bratseth2018-12-038-163/+135
|\ \ | |/ |/|
| * Unused parameter removedOlli Virtanen2018-12-031-2/+2
| * Result merging moved to InterleavedSearchInvokerOlli Virtanen2018-12-038-165/+137
* | Merge pull request #7853 from vespa-engine/bratseth/increase-default-barrier-...Harald Musum2018-12-032-2/+3
|\ \ | |/ |/|
| * Increase timeout as some applications exceed it>Jon Bratseth2018-12-031-1/+2
| * Improve documentationJon Bratseth2018-12-031-1/+1
|/
* Merge pull request #7850 from vespa-engine/revert-7828-hakonhall/add-infrastr...Valerij Fredriksen2018-12-0334-708/+318
|\
| * Revert "Add infrastructure applications to DuperModel"Harald Musum2018-12-0334-708/+318
|/
* Merge pull request #7848 from vespa-engine/freva/make-parallelValerij Fredriksen2018-12-032-2/+2
|\
| * Make stopping parallelValerij Fredriksen2018-12-031-1/+1
| * Fix String.formatValerij Fredriksen2018-12-031-1/+1
* | Merge pull request #7846 from vespa-engine/hakonhall/install-fat-flags-jarHåkon Hallingstad2018-12-034-0/+8
|\ \
| * | Add flags to top-level CMakeLists.txtHåkon Hallingstad2018-12-031-0/+1
| * | Add OWNERS and README.mdHåkon Hallingstad2018-12-032-0/+5
| * | Install fat flags jarHåkon Hallingstad2018-12-031-0/+2
* | | Merge pull request #7830 from vespa-engine/bratseth/build-method-on-config-bu...gjoranv2018-12-0330-78/+188
|\ \ \
| * | | Add build() method to config buildersJon Bratseth2018-11-3030-78/+188
* | | | Merge pull request #7845 from vespa-engine/hakonhall/install-flags-component-...Arnstein Ressem2018-12-031-0/+1
|\ \ \ \
| * | | | Install flags component for open-source config serverHåkon Hallingstad2018-12-031-0/+1
| | |/ / | |/| |
* | | | Merge pull request #7822 from vespa-engine/havardpe/latchTor Brede Vekterli2018-12-038-62/+233
|\ \ \ \ | |/ / / |/| | |
| * | | use latch instead of executor and improve timing testingHåvard Pettersen2018-11-301-36/+48
| * | | use generic latchHåvard Pettersen2018-11-301-23/+7
| * | | added Latch utilityHåvard Pettersen2018-11-296-3/+178
* | | | Merge pull request #7828 from vespa-engine/hakonhall/add-infrastructure-appli...Håkon Hallingstad2018-12-0334-318/+708
|\ \ \ \
| * | | | Fixes after review roundHåkon Hallingstad2018-12-033-10/+3
| * | | | Add infrastructure applications to DuperModelHåkon Hallingstad2018-11-3034-316/+713
* | | | | Merge pull request #7839 from vespa-engine/bratseth/remove-maingjoranv2018-12-036-60/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Non-functional changes onlyJon Bratseth2018-12-025-4/+7
| * | | | Remove unused classJon Bratseth2018-12-021-56/+0
|/ / / /
* | | | Merge pull request #7838 from vespa-engine/bratseth/remove-unused-rpc-server-...Jon Bratseth2018-12-0225-472/+138
|\ \ \ \
| * | | | Listen to the RPC portJon Bratseth2018-12-021-8/+35
| * | | | Revert "Merge pull request #7837 from vespa-engine/revert-7836-bratseth/remov...Jon Bratseth2018-12-0225-472/+111
|/ / / /
* | | | Merge pull request #7832 from vespa-engine/bratseth/deprecate-provisioning-ve...Harald Musum2018-12-0257-193/+315
|\ \ \ \
| * | | | Deprecate com.yahoo.config.provision.VersionJon Bratseth2018-12-0157-193/+315
| | |_|/ | |/| |
* | | | Merge pull request #7837 from vespa-engine/revert-7836-bratseth/remove-unused...Jon Bratseth2018-12-0125-111/+472
|\ \ \ \
| * | | | Revert "Bratseth/remove unused rpc server take 3"Jon Bratseth2018-12-0125-111/+472
|/ / / /
* | | | Merge pull request #7836 from vespa-engine/bratseth/remove-unused-rpc-server-...Jon Bratseth2018-12-0125-472/+111
|\ \ \ \
| * | | | Don't use config injectionJon Bratseth2018-12-013-27/+20
| * | | | Revert "Merge pull request #7835 from vespa-engine/revert-7833-bratseth/remov...Jon Bratseth2018-12-0126-474/+120
|/ / / /
* | | | Merge pull request #7835 from vespa-engine/revert-7833-bratseth/remove-unused...Jon Bratseth2018-12-0126-120/+474
|\ \ \ \
| * | | | Revert "Bratseth/remove unused rpc server take 2"Jon Bratseth2018-12-0126-120/+474
|/ / / /
* | | | Merge pull request #7833 from vespa-engine/bratseth/remove-unused-rpc-server-...Jon Bratseth2018-12-0126-474/+120
|\ \ \ \
| * | | | Bind required configsJon Bratseth2018-12-015-1/+18
| * | | | Register the container with SlobrokJon Bratseth2018-12-012-2/+28
| * | | | Revert "Merge pull request #7831 from vespa-engine/revert-7818-bratseth/remov...Jon Bratseth2018-12-0121-471/+74
|/ / / /
* | | | Merge pull request #7831 from vespa-engine/revert-7818-bratseth/remove-unused...Jon Bratseth2018-11-3021-74/+471
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Remove zombie code"Håkon Hallingstad2018-12-0121-74/+471
|/ / /