aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Need trailing slashHarald Musum2020-09-101-1/+1
* Add function for installing configdefinitions from directoryHarald Musum2020-09-101-0/+4
* Merge pull request #14364 from vespa-engine/havardpe/set-omp-num-threads-to-1...Arne H Juul2020-09-101-0/+3
|\
| * set omp num threads to 1 when running *proton*Håvard Pettersen2020-09-101-0/+3
* | Merge pull request #14363 from vespa-engine/revert-14335-revert-14330-revert-...Arnstein Ressem2020-09-1015-453/+466
|\ \ | |/ |/|
| * Revert "Move code from RemoteSession to SessionRepository, take 3"Harald Musum2020-09-1015-453/+466
|/
* Merge pull request #14335 from vespa-engine/revert-14330-revert-14308-hmusum/...Harald Musum2020-09-1015-466/+453
|\
| * Clean up code for adding and deleting remote sessionsHarald Musum2020-09-093-43/+63
| * Always add to cache now that we change RemoteSession for sessions with same idHarald Musum2020-09-091-12/+2
| * Remove localsession from SessionStateWatcher, not neededHarald Musum2020-09-092-22/+10
| * Revert "Revert " Move code from RemoteSession to SessionRepository, take 2""Harald Musum2020-09-0915-415/+404
* | Merge pull request #14334 from vespa-engine/arnej/get-memory-usage-from-tensorsArne H Juul2020-09-1017-47/+97
|\ \
| * | memory_used -> mem_usage to reflect semantic changeArne Juul2020-09-101-9/+9
| * | better accounting in SimpleTensorArne Juul2020-09-093-10/+19
| * | account for accounting infoArne Juul2020-09-091-1/+1
| * | remove count_memory_used from TensorArne Juul2020-09-099-34/+9
| * | use MemoryUsage from TensorArne Juul2020-09-092-12/+13
| * | add get_memory_usage for tensor::TensorArne Juul2020-09-097-0/+36
| * | add get_memory_usage for StashArne Juul2020-09-092-3/+25
| * | add methods to extract memory usageArne Juul2020-09-091-0/+7
* | | Merge pull request #14362 from vespa-engine/hmusum/wait-longer-before-startin...Jon Marius Venstad2020-09-101-3/+1
|\ \ \
| * | | Wait with starting SessionsMaintainerHarald Musum2020-09-101-3/+1
* | | | Merge pull request #14359 from vespa-engine/revert-14352-revert-14329-hmusum/...Jon Bratseth2020-09-108-166/+3
|\ \ \ \
| * | | | Revert "Revert "Remove deprecated methods and unnecessary compatibility code"...Harald Musum2020-09-108-166/+3
* | | | | Merge pull request #14358 from vespa-engine/revert-14350-revert-14331-hmusum/...Harald Musum2020-09-107-42/+43
|\ \ \ \ \
| * | | | | Revert "Revert "Add force request property to PrepareParams" MERGEOK"Harald Musum2020-09-107-42/+43
| |/ / / /
* | | | | Merge pull request #14355 from vespa-engine/balder/also-handle-non-compressab...Henning Baldersheim2020-09-104-11/+32
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Extend unit test to verify that encoding chosen matches expected.Henning Baldersheim2020-09-103-7/+21
| * | | | Add test for handling of non-compressable data, and handle it correctly.Henning Baldersheim2020-09-092-5/+12
* | | | | Merge pull request #14361 from vespa-engine/revert-14347-revert-14338-vekterl...Henning Baldersheim2020-09-104-13/+37
|\ \ \ \ \
| * | | | | Revert "Revert "Support 'id' as field name in C++ document selection lexing/p...Henning Baldersheim2020-09-104-13/+37
|/ / / / /
* | | | | Merge pull request #14360 from vespa-engine/revert-14349-revert-14332-toregge...Henning Baldersheim2020-09-102-2/+5
|\ \ \ \ \
| * | | | | Revert "Revert "Ignore summary override if attribute vector is missing." MERG...Henning Baldersheim2020-09-102-2/+5
|/ / / / /
* | | | | Merge pull request #14343 from vespa-engine/toregge/compact-document-metastor...Henning Baldersheim2020-09-101-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Compact document meta store lid space when replay is done.Tor Egge2020-09-091-1/+5
* | | | | Merge pull request #14354 from vespa-engine/revert-14346-revert-14278-bratset...Jon Bratseth2020-09-101-6/+0
|\ \ \ \ \
| * | | | | Revert "Revert "Remove phrase-segmenting feature flag" MERGEOK"Jon Bratseth2020-09-091-6/+0
* | | | | | Merge pull request #14353 from vespa-engine/revert-14348-revert-14336-bratset...Jon Bratseth2020-09-1010-32/+112
|\ \ \ \ \ \
| * | | | | | Revert "Revert "Bratseth/allocation improvements" MERGEOK"Jon Bratseth2020-09-0910-32/+112
| |/ / / / /
* | | | | | Merge pull request #14357 from vespa-engine/jonmv/accept-default-port-being-h...Jon Marius Venstad2020-09-092-4/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Handle default port for http and https being hidden by java URIJon Marius Venstad2020-09-092-4/+14
* | | | | | Merge pull request #14352 from vespa-engine/revert-14329-hmusum/remove-deprec...Valerij Fredriksen2020-09-098-3/+166
|\ \ \ \ \ \
| * | | | | | Revert "Remove deprecated methods and unnecessary compatibility code"Jon Marius Venstad2020-09-098-3/+166
* | | | | | | Merge pull request #14351 from vespa-engine/revert-14319-revert-14314-revert-...Valerij Fredriksen2020-09-0924-316/+145
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Revert "Revert "Balder/group commits to tls 2 remaining rebased"""Jon Marius Venstad2020-09-0924-316/+145
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #14350 from vespa-engine/revert-14331-hmusum/add-force-par...Valerij Fredriksen2020-09-097-43/+42
|\ \ \ \ \ \
| * | | | | | Revert "Add force request property to PrepareParams"Jon Marius Venstad2020-09-097-43/+42
* | | | | | | Merge pull request #14349 from vespa-engine/revert-14332-toregge/ignore-summa...Valerij Fredriksen2020-09-092-5/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Revert "Ignore summary override if attribute vector is missing."Jon Marius Venstad2020-09-092-5/+2
| |/ / / / /
* | | | | | Merge pull request #14348 from vespa-engine/revert-14336-bratseth/allocation-...Valerij Fredriksen2020-09-0910-112/+32
|\ \ \ \ \ \