summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4485 from vespa-engine/bergum/same-doc-operation-orderingJon Bratseth2017-12-191-3/+7
|\
| * Fix ordering issue when there are more then one pending operation for a documentJo Kristian Bergum2017-12-191-3/+7
* | Merge pull request #4477 from vespa-engine/geirst/subscribe-to-bucketspaces-c...Tor Brede Vekterli2017-12-196-43/+140
|\ \
| * | Simplify use of unique ptr.Geir Storli2017-12-191-6/+6
| * | Utilize class template argument deduction (in C++17).Geir Storli2017-12-191-10/+10
| * | Let StorageNode subscribe to BucketspacesConfig and propagate to storage comp...Geir Storli2017-12-186-30/+127
* | | Merge pull request #4482 from vespa-engine/hakonhall/add-pause-between-retrie...Håkon Hallingstad2017-12-192-37/+32
|\ \ \ | |_|/ |/| |
| * | Rely on tick for retries against same config server for node adminHåkon Hallingstad2017-12-193-50/+30
| * | Add pause between retries to config serverHåkon Hallingstad2017-12-192-0/+15
* | | Merge pull request #4479 from vespa-engine/balder/nested-namespaceGeir Storli2017-12-1934-202/+120
|\ \ \
| * | | Avoid division imposed by moduloHenning Baldersheim2017-12-181-2/+4
| * | | Unify on nested namespace.Henning Baldersheim2017-12-1834-200/+116
* | | | Merge pull request #4483 from vespa-engine/hmusum/temporarily-skip-config-con...Jon Bratseth2017-12-191-1/+0
|\ \ \ \
| * | | | Remove container-clustercontroller from list of services to checkHarald Musum2017-12-191-2/+0
| * | | | Skip checking config convergence for clustercontrollerHarald Musum2017-12-191-1/+2
* | | | | Merge pull request #4476 from vespa-engine/bratseth/always-retry-hanging-jobsJon Bratseth2017-12-192-35/+41
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Always retry hanging jobsJon Bratseth2017-12-182-35/+41
* | | | | Merge pull request #4481 from vespa-engine/revert-4480-revert-4467-bratseth/r...Henning Baldersheim2017-12-191-4/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Revert "Restore public method""Jon Bratseth2017-12-191-4/+15
|/ / / /
* | | | Merge pull request #4468 from vespa-engine/bjorncs/json-access-logMorten Tokle2017-12-192-8/+0
|\ \ \ \
| * | | | Remove time-iso8601 fieldBjørn Christian Seime2017-12-182-8/+0
* | | | | Merge pull request #4480 from vespa-engine/revert-4467-bratseth/restore-publi...Henning Baldersheim2017-12-191-15/+4
|\ \ \ \ \
| * | | | | Revert "Restore public method"Henning Baldersheim2017-12-191-15/+4
|/ / / / /
* | | | | Merge pull request #4467 from vespa-engine/bratseth/restore-public-applicatio...Jon Bratseth2017-12-181-4/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Restore public methodJon Bratseth2017-12-181-4/+15
| |/ / /
* | | | Merge pull request #4478 from vespa-engine/vekterli/dynamic-documentapiconver...Geir Storli2017-12-185-19/+60
|\ \ \ \
| * | | | Make DocumentApiConverter's BucketResolver dynamicTor Brede Vekterli2017-12-185-19/+60
* | | | | Merge pull request #4472 from vespa-engine/balder/estimate-hash-map-requireme...Geir Storli2017-12-1817-91/+68
|\ \ \ \ \
| * | | | | Consider overlapping dimensions when estimating resulting tensor space.Henning Baldersheim2017-12-185-24/+40
| * | | | | Estimate number of cells needed in the hashmap.Henning Baldersheim2017-12-182-2/+3
| * | | | | Use nested namespace.Henning Baldersheim2017-12-1814-66/+26
* | | | | | Merge pull request #4475 from vespa-engine/bjorncs/make-controller-api-proper...gjoranv2017-12-181-66/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add dependency on container-devBjørn Christian Seime2017-12-181-66/+1
|/ / / / /
* | | | | Merge pull request #4474 from vespa-engine/bratseth/change-error-messageJon Bratseth2017-12-181-1/+1
|\ \ \ \ \
| * | | | | Don't abbreviateJon Bratseth2017-12-181-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #4473 from vespa-engine/mortent/idprovider-w-sslcontextMorten Tokle2017-12-182-0/+63
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Setup ssl context in Athenz identity providerMorten Tokle2017-12-182-0/+63
| |/ / /
* | | | Merge pull request #4470 from vespa-engine/balder/create-supervisor-once-and-...Arne H Juul2017-12-183-5/+16
|\ \ \ \
| * | | | Use one supervisor and transport and shut it down once it not needed anymore.Henning Baldersheim2017-12-183-5/+16
* | | | | Merge pull request #4471 from vespa-engine/vekterli/make-flex-bison-outputs-e...Henning Baldersheim2017-12-183-11/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make Flex and Bison outputs explicit in CMakeLists.txtTor Brede Vekterli2017-12-183-11/+8
| | |_|/ | |/| |
* | | | Merge pull request #4454 from vespa-engine/bjorncs/jdisc-eofexceptiongjoranv2017-12-181-3/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | EofException is always wrapped in CompletionExceptionBjørn Christian Seime2017-12-151-3/+5
* | | | Merge pull request #4465 from vespa-engine/hakonhall/lz4-overwrite-destinatio...Håkon Hallingstad2017-12-181-2/+3
|\ \ \ \
| * | | | lz4 overwrite destination pathHåkon Hallingstad2017-12-181-2/+3
| | |/ / | |/| |
* | | | Merge pull request #4463 from vespa-engine/balder/pack-sparse-tensor-adress-refGeir Storli2017-12-187-52/+39
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use nested namespace.Henning Baldersheim2017-12-183-28/+17
| * | | Reserve space up front.Henning Baldersheim2017-12-181-13/+7
| * | | Add method to allocate space up front.Henning Baldersheim2017-12-181-4/+3
| * | | Only use 32 bits for hash and size.Henning Baldersheim2017-12-182-9/+9