summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4922 from vespa-engine/bratseth/add-loggingLester Solbakken2018-02-054-5/+10
|\
| * Add logging when adding a constantJon Bratseth2018-02-054-5/+10
|/
* Merge pull request #4917 from vespa-engine/havardpe/allow-serializing-dense-t...Arne H Juul2018-02-059-13/+23
|\
| * allow serializing dense tensor viewsHåvard Pettersen2018-02-059-13/+23
* | Merge pull request #4918 from vespa-engine/revert-4916-balder/again-when-time...Henning Baldersheim2018-02-053-13/+7
|\ \
| * | Revert "Balder/again when time is up it is up"Henning Baldersheim2018-02-053-13/+7
|/ /
* | Merge pull request #4915 from vespa-engine/geirst/misc-cleanup-after-new-docu...Tor Egge2018-02-056-8/+6
|\ \
| * | Add class description.Geir Storli2018-02-051-1/+1
| * | Use separate error code for UNKNOWN_BUCKET_SPACE.Geir Storli2018-02-053-4/+5
| * | Remove no longer relevant todos.Geir Storli2018-02-052-3/+0
* | | Merge pull request #4916 from vespa-engine/balder/again-when-time-is-up-it-is-upJon Bratseth2018-02-053-7/+13
|\ \ \
| * | | Add readability.Henning Baldersheim2018-02-051-2/+10
| * | | When time is up it is up. Here too.Henning Baldersheim2018-02-052-5/+3
|/ / /
* | | Merge pull request #4913 from vespa-engine/bratseth/feature-names-cleanupLester Solbakken2018-02-0547-411/+675
|\ \ \
| * | | Use all query profiles and handle conflictsJon Bratseth2018-02-055-14/+25
| * | | CleanupJon Bratseth2018-02-051-17/+0
| * | | Use query profiles already readJon Bratseth2018-02-0535-215/+406
| * | | Unify canonicalizationJon Bratseth2018-02-0310-72/+111
| * | | Fetaure names cleanup WIPJon Bratseth2018-02-026-44/+84
* | | | Merge pull request #4909 from vespa-engine/balder/recursive-fieldset-lookupGeir Storli2018-02-0513-173/+192
|\ \ \ \
| * | | | NULL -> nullptrHenning Baldersheim2018-02-048-29/+29
| * | | | Rankmanager must also handle fieldsets recursively.Henning Baldersheim2018-02-044-64/+80
| * | | | Break endless recursionHenning Baldersheim2018-02-041-1/+1
| * | | | Make fieldset resolution recursive.Henning Baldersheim2018-02-041-13/+35
| * | | | C++11 for loopsHenning Baldersheim2018-02-031-69/+50
* | | | | Merge pull request #4912 from vespa-engine/balder/avoid-crossing-creek-for-waterHenning Baldersheim2018-02-051-1/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | No need to compress just to uncompress.Henning Baldersheim2018-02-051-1/+9
| | |_|/ | |/| |
* | | | Merge pull request #4908 from vespa-engine/balder/improve-error-codes-during-...Henning Baldersheim2018-02-0510-20/+53
|\ \ \ \
| * | | | Factor out for readability.Henning Baldersheim2018-02-052-5/+5
| * | | | Avoid import by *Henning Baldersheim2018-02-035-8/+14
| * | | | Try to differentiate between client and server errors.Henning Baldersheim2018-02-036-5/+32
| * | | | Reduce loglevel to debug.Henning Baldersheim2018-02-032-3/+3
| | |/ / | |/| |
* | | | Merge pull request #4911 from vespa-engine/mpolden/application-versionMartin Polden2018-02-0519-292/+443
|\ \ \ \ | |_|/ / |/| | |
| * | | Determine application version in test environmentsMartin Polden2018-02-058-88/+107
| * | | Let outstanding change know the application versionMartin Polden2018-02-059-49/+68
| * | | Migrate to new application versionMartin Polden2018-02-0515-221/+334
* | | | Merge pull request #4903 from vespa-engine/jvenstad/secure-endpoints-2Jon Marius Venstad2018-02-057-46/+17
|\ \ \ \
| * | | | Update testsJon Marius Venstad2018-02-054-4/+7
| * | | | Expose new global endpoints in apiJon Marius Venstad2018-02-021-0/+1
| * | | | CleanerJon Marius Venstad2018-02-022-7/+7
| * | | | CleanJon Marius Venstad2018-02-023-43/+10
* | | | | Merge pull request #4910 from vespa-engine/musum/handle-long-filenames-in-tar...Henning Baldersheim2018-02-054-5/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update commons-compress to a newer versionHarald Musum2018-02-052-2/+1
| * | | | Handle long file names in tar archivesHarald Musum2018-02-052-3/+6
|/ / / /
* | | | Merge pull request #4907 from vespa-engine/balder/fix-setting-of-top-aka-max-...Jon Bratseth2018-02-042-3/+61
|\ \ \ \ | |_|/ / |/| | |
| * | | Propagate max() within nested all to propagate properly.Henning Baldersheim2018-02-032-3/+61
|/ / /
* | | Merge pull request #4806 from vespa-engine/arnej/adjust-unit-test-timoutHenning Baldersheim2018-02-021-1/+1
|\ \ \
| * | | need more time when run as part of parallel buildArne Juul2018-01-301-1/+1
* | | | Merge pull request #4905 from vespa-engine/revert-4904-hakonhall/create-etcvespaHenning Baldersheim2018-02-021-3/+0
|\ \ \ \
| * | | | Revert "Create /etc/vespa"Henning Baldersheim2018-02-021-3/+0
|/ / / /