summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary dependency on filedistributionHarald Musum2017-11-172-10/+0
* Merge pull request #4156 from vespa-engine/bjorncs/athenz-ssl-keystore-config...Morten Tokle2017-11-172-0/+126
|\
| * Verify actual expiryBjørn Christian Seime2017-11-161-0/+12
| * Reduce update frequencyBjørn Christian Seime2017-11-161-1/+2
| * Disable Athenz ssl keystore configurator in mainBjørn Christian Seime2017-11-161-0/+7
| * Add Athenz implementation of SslKeyStoreConfiguratorBjørn Christian Seime2017-11-162-0/+106
* | Merge pull request #4177 from vespa-engine/revert-4175-revert-4162-revert-414...Harald Musum2017-11-1610-156/+15
|\ \
| * | Revert "Revert "Revert "Hmusum/move new filedistribution classes"""Harald Musum2017-11-1610-156/+15
|/ /
* | Merge pull request #4175 from vespa-engine/revert-4162-revert-4140-hmusum/mov...Jon Marius Venstad2017-11-1610-15/+156
|\ \
| * | Revert "Revert "Hmusum/move new filedistribution classes""Harald Musum2017-11-1610-15/+156
* | | Merge pull request #4145 from vespa-engine/mortent/add-lbaddress-nameMorten Tokle2017-11-1611-46/+121
|\ \ \
| * | | Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-1511-46/+121
* | | | Merge pull request #4173 from vespa-engine/bjorncs/human-friendly-timestampMorten Tokle2017-11-162-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Also log timestamp in human-friendly formatBjørn Christian Seime2017-11-162-0/+8
* | | | Merge pull request #4172 from vespa-engine/toregge/remove-unused-maintenance-...Geir Storli2017-11-164-62/+1
|\ \ \ \
| * | | | Remove unused class MaintenanceBucket.Tor Egge2017-11-164-62/+1
* | | | | Merge pull request #4169 from vespa-engine/hmusum/dont-depend-on-filedistribu...gjoranv2017-11-161-5/+0
|\ \ \ \ \
| * | | | | Don't depend on filedistributionHarald Musum2017-11-161-5/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #4168 from vespa-engine/vekterli/flip-internal-priorities-...Tor Brede Vekterli2017-11-162-5/+5
|\ \ \ \ \
| * | | | | Flip internal priorities of GC and move-only mergeTor Brede Vekterli2017-11-162-5/+5
* | | | | | Merge pull request #4167 from vespa-engine/geirst/prepare-storageapi-protocol...Tor Brede Vekterli2017-11-165-60/+77
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add API function to encode a bucket space.Geir Storli2017-11-165-0/+10
| * | | | | Add API function to encode a bucket.Geir Storli2017-11-165-19/+27
| * | | | | Add API function to decode a bucket space to reduce direct use of placeholder...Geir Storli2017-11-165-3/+11
| * | | | | Add API function to decode a bucket to reduce direct use of placeholder bucke...Geir Storli2017-11-165-38/+29
* | | | | | Merge pull request #4163 from vespa-engine/lesters/enable-tensor-conformance-...Jon Bratseth2017-11-163-36/+50
|\ \ \ \ \ \
| * | | | | | 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