summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15678 from vespa-engine/havardpe/remove-engine-or-factoryHåvard Pettersen2020-12-0427-356/+73
|\
| * remove EngineOrFactoryHåvard Pettersen2020-12-0427-356/+73
* | Merge pull request #15690 from vespa-engine/revert-15686-bratseth/simplify-co...Jon Bratseth2020-12-0463-116/+278
|\ \
| * | Revert "Keep internal-redeploy serverside. Remove old restartOnDeploy impleme...Jon Bratseth2020-12-0463-116/+278
|/ /
* | Merge pull request #15689 from vespa-engine/bratseth/autoscale-soonerJon Bratseth2020-12-041-1/+1
|\ \
| * | Start a little more optimisticJon Bratseth2020-12-041-1/+1
|/ /
* | Merge pull request #15686 from vespa-engine/bratseth/simplify-configJon Bratseth2020-12-0463-278/+116
|\ \
| * | Keep internal-redeploy serverside. Remove old restartOnDeploy implementation.Jon Bratseth2020-12-0463-278/+116
* | | Merge pull request #15684 from vespa-engine/mpolden/more-loggingHarald Musum2020-12-042-8/+23
|\ \ \
| * | | Log eventMartin Polden2020-12-041-3/+3
| * | | Use a no-op watcherMartin Polden2020-12-041-1/+12
| * | | Log the total time taken to reconfigureMartin Polden2020-12-042-7/+11
| |/ /
* | | Merge pull request #15685 from vespa-engine/toregge/stop-including-llvm-linka...Henning Baldersheim2020-12-041-8/+0
|\ \ \
| * | | Stop including llvm/LinkAllPasses.h. We use a shared llvm library.Tor Egge2020-12-041-8/+0
* | | | Merge pull request #15683 from vespa-engine/toregge/add-missing-includesHenning Baldersheim2020-12-044-1/+4
|\ \ \ \
| * | | | Add missing includes. Fix format string.Tor Egge2020-12-044-1/+4
| |/ / /
* | | | Merge pull request #15674 from vespa-engine/bjorncs/fixValerij Fredriksen2020-12-042-10/+2
|\ \ \ \
| * | | | Remove duplicate definition of feature flagBjørn Christian Seime2020-12-042-10/+2
* | | | | Merge pull request #15676 from vespa-engine/bjorncs/cleanupBjørn Christian Seime2020-12-041-6/+5
|\ \ \ \ \
| * | | | | Remove usage of deprecated methodsBjørn Christian Seime2020-12-041-6/+5
* | | | | | Merge pull request #15677 from vespa-engine/jonmv/reindexing-over-multiple-cl...Jon Marius Venstad2020-12-0412-137/+250
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge reindexing responses with multiple clusters in client in cfg serverJon Marius Venstad2020-12-045-52/+142
| * | | | | Support multiple clusters in one cluster controllerJon Marius Venstad2020-12-048-94/+111
| * | | | | Expect NPE when we should expect NPE, and avoid IAE due to illegal configJon Marius Venstad2020-12-041-1/+2
| * | | | | Revert "Revert "Expand config to allow mulitple clusters per reindexer""Jon Marius Venstad2020-12-041-1/+6
| |/ / / /
* | | | | Merge pull request #15680 from vespa-engine/bratseth/propagate-restartOnDeployJon Bratseth2020-12-044-0/+34
|\ \ \ \ \
| * | | | | Don't propagate if internal redeployJon Bratseth2020-12-041-0/+2
| * | | | | Propagate explicit restartOnDeploy to clusterJon Bratseth2020-12-044-0/+32
| |/ / / /
* | | | | Merge pull request #15669 from vespa-engine/geirst/reapply-super-bucket-key-t...Geir Storli2020-12-045-10/+68
|\ \ \ \ \
| * | | | | Use the super bucket key when resolving which RPC target to use to handle a c...Geir Storli2020-12-045-10/+68
* | | | | | Merge pull request #15681 from vespa-engine/jonmv/validate-more-tenant-and-ap...Jon Marius Venstad2020-12-044-2/+6
|\ \ \ \ \ \
| * | | | | | Call extra validation (non-"default", lowercase) for tenant, app, instance IDsJon Marius Venstad2020-12-044-2/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #15673 from vespa-engine/hmusum/handle-reconfig-in-progressMartin Polden2020-12-042-9/+79
|\ \ \ \ \ \
| * | | | | | Implement suggestions from review (sleeper, more logging, sleep shorter)Harald Musum2020-12-042-9/+26
| * | | | | | Split out constantHarald Musum2020-12-041-2/+3
| * | | | | | Retry reconfiguration if another one is in progressHarald Musum2020-12-042-7/+59
* | | | | | | Merge pull request #15672 from vespa-engine/bratseth/adaptive-scaling-windowValerij Fredriksen2020-12-0410-61/+145
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Adaptive scaling windowJon Bratseth2020-12-0410-61/+145
* | | | | | | Merge pull request #15675 from vespa-engine/toregge/add-operator-overloads-to...Henning Baldersheim2020-12-044-0/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add operator overloads to avoid ambiguous reversed operators.Tor Egge2020-12-044-0/+9
|/ / / / / /
* | | | | | Merge pull request #15671 from vespa-engine/toregge/split-up-tensor-model-hppHenning Baldersheim2020-12-044-233/+276
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Split up tensor_model.hpp to avoid ODR violation.Tor Egge2020-12-044-233/+276
|/ / / / /
* | | | | Merge pull request #15670 from vespa-engine/toregge/avoid-bitwise-or-of-diffe...Henning Baldersheim2020-12-043-8/+8
|\ \ \ \ \
| * | | | | Avoid bitwise or of different enum types.Tor Egge2020-12-043-8/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #15637 from vespa-engine/ogronnesby/trial-tenant-limitØyvind Grønnesby2020-12-0411-3/+109
|\ \ \ \ \
| * | | | | Fix some import issues after conflict mergeØyvind Grønnesby2020-12-042-1/+3
| * | | | | Merge remote-tracking branch 'origin/master' into ogronnesby/trial-tenant-limitØyvind Grønnesby2020-12-03527-7584/+6628
| |\ \ \ \ \
| * | | | | | Rename the output value in the user APIØyvind Grønnesby2020-12-036-7/+36
| * | | | | | Expose create trial limit in user APIØyvind Grønnesby2020-12-037-12/+25
| * | | | | | Introduce trial tenant limitØyvind Grønnesby2020-12-015-0/+59