summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #4119 from vespa-engine/hmusum/support-directory-as-filere...Henning Baldersheim2017-11-142-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Support directory as file referenceHarald Musum2017-11-142-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4114 from vespa-engine/geirst/reduce-usage-of-place-holde...Tor Brede Vekterli2017-11-142-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce use of BucketSpace::placeHolder().Geir Storli2017-11-142-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4115 from vespa-engine/toregge/use-std-mutex-in-searchcor...Geir Storli2017-11-142-7/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use std::mutex in searchcore MatchEngine.Tor Egge2017-11-142-7/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4118 from vespa-engine/lesters/tensor-moduloJon Bratseth2017-11-147-2/+40
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add % to Java ranking expressions to conform with C++Lester Solbakken2017-11-147-2/+40
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4102 from vespa-engine/toregge/change-distributor-bucket-...Geir Storli2017-11-1410-116/+71
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix indentation.Tor Egge2017-11-141-1/+1
| * | | | | Use tracking of sent api::RequestBucketInfoCommand to supply correctTor Egge2017-11-132-5/+5
| * | | | | Remove old buckets from all distributor bucket databases when distributionTor Egge2017-11-133-23/+22
| * | | | | Remove distribution from ClusterInformation and SimpleClusterInformation.Tor Egge2017-11-137-49/+6
| * | | | | Partially change BucketDBUpdater to use document::Bucket instead ofTor Egge2017-11-135-39/+38
| | |_|/ / | |/| | |
* | | | | Merge pull request #4110 from vespa-engine/bratseth/suppress-parse-stderr-outputArne H Juul2017-11-143-6/+12
|\ \ \ \ \
| * | | | | Optimize importsJon Bratseth2017-11-141-8/+0
| * | | | | Suppress parser output on stderrJon Bratseth2017-11-143-6/+20
* | | | | | Merge pull request #4112 from vespa-engine/musum/revert-wire-in-of-Applicatio...Arnstein Ressem2017-11-141-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert, does not work for transferring a directory with many filesHarald Musum2017-11-141-1/+3
| |/ / / /
* | | | | Merge pull request #4111 from vespa-engine/lesters/tensor-conformanceJon Bratseth2017-11-143-2/+24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix 'Cannot combine two tensors using ldexp'Lester Solbakken2017-11-143-1/+3
| * | | | Fix 'Cannot combine two tensors using fmod'Lester Solbakken2017-11-142-0/+2
| * | | | Fix 'Cannot combine two tensors using pow'Lester Solbakken2017-11-142-0/+2
| * | | | Fix 'Tensors cannot be compared with ~='Lester Solbakken2017-11-142-1/+17
* | | | | Merge pull request #4104 from vespa-engine/geirst/make-storagebucketdbinitial...Tor Brede Vekterli2017-11-142-57/+115
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Simplify as std::unique_ptr has operator bool.Geir Storli2017-11-141-2/+2
| * | | | Use emplace instead of insert.Geir Storli2017-11-141-1/+1
| * | | | Fix typo.Geir Storli2017-11-141-1/+1
| * | | | Use std::make_shared instead of new.Geir Storli2017-11-141-4/+3
| * | | | Make StorageBucketDBInitializer bucket space aware.Geir Storli2017-11-132-54/+113
* | | | | Merge pull request #4099 from vespa-engine/revert-3966-hakonhall/avoid-changi...Bjørn Christian Seime2017-11-142-15/+8
|\ \ \ \ \
| * | | | | Revert "Avoid changing API before all clients handle it"Håkon Hallingstad2017-11-132-15/+8
* | | | | | Merge pull request #4103 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-11-141-1/+1
|\ \ \ \ \ \
| * | | | | | Increase number of threadsBjørn Christian Seime2017-11-141-1/+1
* | | | | | | Merge pull request #4108 from vespa-engine/bratseth/add-allowed-to-be-downJon Bratseth2017-11-149-6/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add allowedToBeDown to nodes in nodes/v2 APIJon Bratseth2017-11-149-6/+29
|/ / / / / /
* | | | | | Merge pull request #4106 from vespa-engine/hmusum/register-method-using-clien...Henning Baldersheim2017-11-148-66/+146
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Register receiveFile with the client supervisorHarald Musum2017-11-148-66/+146
* | | | | | Merge pull request #4107 from vespa-engine/bratseth/tweak-reason-2Jon Marius Venstad2017-11-141-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Better reasonJon Bratseth2017-11-141-1/+2
* | | | | | Merge pull request #4105 from vespa-engine/bjorncs/bundle-plugin-testHåkon Hallingstad2017-11-132-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix unstable testBjørn Christian Seime2017-11-131-1/+1
| * | | | | Use com.yahoo.vespa as artifact id of bundle-plugin-testBjørn Christian Seime2017-11-131-1/+1
* | | | | | Merge pull request #4070 from vespa-engine/freva/certificate-signerValerij Fredriksen2017-11-138-2/+478
|\ \ \ \ \ \
| * | | | | | Move (De)serializers out of servletValerij Fredriksen2017-11-103-36/+53
| * | | | | | assert* -> verify*Valerij Fredriksen2017-11-102-10/+10
| * | | | | | Store provider and certificate converter as instance fieldsValerij Fredriksen2017-11-101-3/+7
| * | | | | | CERTIFICATE_DURATION -> CERTIFICATE_EXPIRATIONValerij Fredriksen2017-11-102-3/+3
| * | | | | | Renamed filesValerij Fredriksen2017-11-103-14/+14
| * | | | | | Added javadocValerij Fredriksen2017-11-101-1/+13