summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Enable Java tensor conformance testLester Solbakken2017-11-163-36/+50
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4164 from vespa-engine/toregge/add-getbucket-method-to-st...Geir Storli2017-11-166-0/+21
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add getBucket() method to storage commands/replies that haveTor Egge2017-11-166-0/+21
| |/ / / / / /
* | | | | | | Merge pull request #4162 from vespa-engine/revert-4140-hmusum/move-new-filedi...Arnstein Ressem2017-11-1610-156/+15
|\ \ \ \ \ \ \
| * | | | | | | Revert "Hmusum/move new filedistribution classes"Harald Musum2017-11-1610-156/+15
| |/ / / / / /
* | | | | | | Merge pull request #4161 from vespa-engine/bjorncs/fixgjoranv2017-11-161-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Assert that there is only a single injected componentBjørn Christian Seime2017-11-161-0/+2
|/ / / / / /
* | | | | | Merge pull request #4157 from vespa-engine/lesters/java-concat-tensors-unequa...Jon Bratseth2017-11-162-9/+2
|\ \ \ \ \ \
| * | | | | | Java tensors: support unequal size when concatenatingLester Solbakken2017-11-162-9/+2
* | | | | | | Merge pull request #4160 from vespa-engine/toregge/use-make-bucket-space-in-m...Geir Storli2017-11-161-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Use makeBucketSpace() in makeDocumentBucket().Tor Egge2017-11-161-1/+2
* | | | | | | | Merge pull request #4131 from vespa-engine/vekterli/make-merge-throttler-buck...Geir Storli2017-11-165-27/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Add std::ostream operator<< overload to BucketTor Brede Vekterli2017-11-142-0/+6
| * | | | | | | | Track merges by Bucket instead of BucketId in MergeThrottlerTor Brede Vekterli2017-11-143-27/+16
* | | | | | | | | Merge pull request #4158 from vespa-engine/mpolden/remove-unused-classHarald Musum2017-11-162-70/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused includeMartin Polden2017-11-161-1/+0
| * | | | | | | | | Remove unused ControllerCuratorDbMartin Polden2017-11-161-69/+0
* | | | | | | | | | Merge pull request #4141 from vespa-engine/balder/do-not-allow-libc-allocator...Henning Baldersheim2017-11-161-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Do not allow the default libc allocator under linux to excess in memory footp...Henning Baldersheim2017-11-151-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #4159 from vespa-engine/bjorncs/inject-ssl-keystore-config...Bjørn Christian Seime2017-11-162-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Setup injection of SslKeyStoreConfigurator in config-modelBjørn Christian Seime2017-11-162-1/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #4140 from vespa-engine/hmusum/move-new-filedistribution-c...Harald Musum2017-11-1610-15/+156
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | FixHarald Musum2017-11-151-1/+1
| * | | | | | | Use project version for vespa dependenciesHarald Musum2017-11-152-15/+15
| * | | | | | | Move classes to filedistribution moduleHarald Musum2017-11-1510-11/+152
* | | | | | | | Merge pull request #4144 from vespa-engine/toregge/scan-all-bucket-dbs-in-dis...Geir Storli2017-11-167-28/+87
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Correct macro argument order when checking for equality, first argument isTor Egge2017-11-151-2/+2
| * | | | | | | Scan all bucket dbs in storage::distributor::SimpleMaintenanceScanner.Tor Egge2017-11-157-28/+87
* | | | | | | | Merge pull request #4147 from vespa-engine/geirst/make-modified-bucket-checke...Tor Brede Vekterli2017-11-164-11/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | Make ModifiedBucketChecker bucket space aware.Geir Storli2017-11-154-11/+77
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4155 from vespa-engine/hmusum/log-when-application-is-rem...Håkon Hallingstad2017-11-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Log when applications is removedHarald Musum2017-11-161-1/+1
* | | | | | | | | Merge pull request #4132 from vespa-engine/bjorncs/custom-ssl-contextBjørn Christian Seime2017-11-1619-128/+301
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | SslKeyStoreConfigurator components must have unique id specBjørn Christian Seime2017-11-151-2/+3
| * | | | | | | | Cleanup ConnectorFactoryBjørn Christian Seime2017-11-151-19/+18
| * | | | | | | | Configure default SslKeyStoreConfigurator in config-model's ConnectorFactoryBjørn Christian Seime2017-11-154-49/+30
| * | | | | | | | Code cleanup: remove 'final' on local variables, less whitespaceBjørn Christian Seime2017-11-151-9/+2
| * | | | | | | | Comment that syntax is for internal use onlyBjørn Christian Seime2017-11-151-1/+1
| * | | | | | | | Remove code duplicationBjørn Christian Seime2017-11-151-19/+11
| * | | | | | | | Support custom SslKeyStoreConfigurator implementation in services.xmlBjørn Christian Seime2017-11-148-4/+86
| * | | | | | | | Add interface for custom keystore implementation with hot-reloadingBjørn Christian Seime2017-11-148-66/+218
| * | | | | | | | Remove meaningless SslKeyStore interfaceBjørn Christian Seime2017-11-145-32/+7
| * | | | | | | | Move JksKeyStore to test source directoryBjørn Christian Seime2017-11-143-4/+2
* | | | | | | | | Merge pull request #4151 from vespa-engine/hmusum/cleanup-zk-paths-for-tenantJon Bratseth2017-11-1611-111/+153
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make naming consistentHarald Musum2017-11-151-3/+3
| * | | | | | | | | Cleanup and simplify code related to zk paths for tenantsHarald Musum2017-11-1511-111/+153
* | | | | | | | | | Merge pull request #4143 from vespa-engine/revert-4142-revert-4127-bratseth/r...Jon Bratseth2017-11-1614-225/+77
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't call initIdJon Bratseth2017-11-151-1/+0
| * | | | | | | | | | Nonfunctional changeJon Bratseth2017-11-151-1/+1
| * | | | | | | | | | Revert "Revert "Remove redundant logic""Jon Bratseth2017-11-1513-224/+77