summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Move filedistribution config definitions to configdefinitions...Harald Musum2017-11-146-35/+5
* Merge pull request #4130 from vespa-engine/revert-4125-hmusum/move-filedistri...Henning Baldersheim2017-11-146-5/+35
|\
| * Revert "Move filedistribution config definitions to configdefinitions module"Harald Musum2017-11-146-5/+35
|/
* Merge pull request #4129 from vespa-engine/havardpe/avoid-premature-iterator-...Henning Baldersheim2017-11-142-22/+5
|\
| * we need to keep all iterators to handle additional rangesHåvard Pettersen2017-11-142-22/+5
* | Merge pull request #4125 from vespa-engine/hmusum/move-filedistribution-confi...Henning Baldersheim2017-11-146-35/+5
|\ \
| * | def files have been movedHarald Musum2017-11-142-5/+1
| * | Move filedistribution config definitions to configdefinitions moduleHarald Musum2017-11-144-30/+4
* | | Merge pull request #4113 from vespa-engine/toregge/use-std-mutex-in-searchcor...Geir Storli2017-11-142-34/+35
|\ \ \
| * | | Use std::lock_guard and scopes instead of std::unique_lock.Tor Egge2017-11-141-14/+17
| * | | Use std::mutex in searchore PersistenceEngine.Tor Egge2017-11-142-23/+21
* | | | Merge pull request #4117 from vespa-engine/toregge/propagate-bucket-space-to-...Geir Storli2017-11-146-23/+26
|\ \ \ \
| * | | | Supply bucket space to operation target resolver implementation and propagateTor Egge2017-11-146-23/+26
* | | | | Merge pull request #4123 from vespa-engine/toregge/consolidate-makebucketspac...Geir Storli2017-11-1414-39/+38
|\ \ \ \ \
| * | | | | Consolidate makeBucketSpace() test functions to document module.Tor Egge2017-11-1414-39/+38
* | | | | | Merge pull request #4120 from vespa-engine/mortent/treat-lbaddress-asstringBjørn Christian Seime2017-11-149-39/+44
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Treat loadbalancer address as string and pass throughMorten Tokle2017-11-149-39/+44
* | | | | | Merge pull request #4124 from vespa-engine/balder/add-chunked-file-rpc-skelet...Henning Baldersheim2017-11-141-6/+45
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | part-id not needed in eof method.Henning Baldersheim2017-11-141-5/+4
| * | | | | Add receive files chunked skeleton.Henning Baldersheim2017-11-141-6/+46
|/ / / / /
* | | | | Merge pull request #4121 from vespa-engine/hmusum/validate-xxhash-when-receiv...Henning Baldersheim2017-11-144-9/+27
|\ \ \ \ \
| * | | | | Validate xxhash when receiving fileHarald Musum2017-11-144-9/+27
* | | | | | Merge pull request #4116 from vespa-engine/balder/simplify-and-always-hold-lo...Henning Baldersheim2017-11-141-15/+6
|\ \ \ \ \ \
| * | | | | | Always hold the lock when accessing the handler map.Henning Baldersheim2017-11-141-15/+6
* | | | | | | 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