summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.202.135-1].vespa-6.202.135-1by-screwdriver2018-02-054-1/+2
* 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
|/ /
* | Merge pull request #4902 from vespa-engine/bratseth/skip-unnecessary-dns-lookupJon Bratseth2018-02-021-16/+12
|\ \
| * | Don't expose methodJon Bratseth2018-02-021-1/+1
| * | Skip DNS lookup that is not usedJon Bratseth2018-02-021-16/+12
* | | Merge pull request #4904 from vespa-engine/hakonhall/create-etcvespaValerij Fredriksen2018-02-021-0/+3
|\ \ \
| * | | Create /etc/vespaHåkon Hallingstad2018-02-021-0/+3
* | | | Merge pull request #4901 from vespa-engine/mpolden/revert-application-versionMartin Polden2018-02-0218-390/+258
|\ \ \ \
| * | | | Revert "Migrate to new application version"Martin Polden2018-02-0215-334/+221
| * | | | Revert "Let outstanding change know the application version"Martin Polden2018-02-029-68/+49
* | | | | Merge pull request #4859 from vespa-engine/balder/shortcut-on-timeoutHenning Baldersheim2018-02-0234-178/+177
|\ \ \ \ \
| * | | | | Even though visually similar, semantic similarity of '1' and 'i' are close to...Henning Baldersheim2018-02-021-1/+1
| * | | | | Put the right assert in the right testcase.Henning Baldersheim2018-02-021-5/+5
| * | | | | Use schematic 'type', 'message', 'details' error schema.Henning Baldersheim2018-02-026-55/+84
| * | | | | Nested namespacesHenning Baldersheim2018-02-0228-132/+89
| * | | | | Correctly test for expiry.Henning Baldersheim2018-02-011-1/+1
| * | | | | Report back as field 'error' the timeout as amount of us on overtime.Henning Baldersheim2018-01-311-2/+7
| * | | | | Shortcut summary generation on timeout.Henning Baldersheim2018-01-311-4/+12
* | | | | | Merge pull request #4900 from vespa-engine/balder/fresh-clionHenning Baldersheim2018-02-021-2/+3
|\ \ \ \ \ \
| * | | | | | Stay up to date with centosHenning Baldersheim2018-02-021-0/+1
| * | | | | | Require clion 2017.3.3Henning Baldersheim2018-02-021-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4897 from vespa-engine/havardpe/make-tensor-function-opti...Arne H Juul2018-02-029-136/+113
|\ \ \ \ \ \
| * | | | | | co-locate optimization with implementationHåvard Pettersen2018-02-029-136/+113
* | | | | | | Merge pull request #4898 from vespa-engine/geirst/more-use-of-fixed-bucket-sp...Geir Storli2018-02-0218-41/+75
|\ \ \ \ \ \ \
| * | | | | | | Simplify by using String.format().Geir Storli2018-02-021-2/+2
| * | | | | | | Define and use fixed bucket spaces names.Geir Storli2018-02-027-14/+31
| * | | | | | | Define and use fixed bucket spaces in Java code.Geir Storli2018-02-0211-27/+44
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4899 from vespa-engine/bjorncs/correct-timestamp-access-logJon Bratseth2018-02-021-6/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | SimpleDateFormat is not thread-safeBjørn Christian Seime2018-02-021-6/+4
* | | | | | | Merge pull request #4896 from vespa-engine/bratseth/if-type-generalize-dimens...Lester Solbakken2018-02-023-7/+49
|\ \ \ \ \ \ \
| * | | | | | | Generalize dimension-wiseJon Bratseth2018-02-023-7/+49
| |/ / / / / /
* | | | | | | Merge pull request #4891 from vespa-engine/balder/handle-timedout-hitsHenning Baldersheim2018-02-026-36/+122
|\ \ \ \ \ \ \
| * | | | | | | remove unused codeHenning Baldersheim2018-02-021-6/+0
| * | | | | | | Add comment on return valueHenning Baldersheim2018-02-021-3/+3
| * | | | | | | Add comment on return valueHenning Baldersheim2018-02-021-0/+1
| * | | | | | | Avoid import by *.Henning Baldersheim2018-02-021-18/+29
| * | | | | | | Use a ResultObject to avoid using Exception for value passing.Henning Baldersheim2018-02-023-27/+47
| * | | | | | | Propagate timeout errors up in fill phase.Henning Baldersheim2018-02-015-32/+92
* | | | | | | | Merge pull request #4894 from vespa-engine/toregge/reduce-use-of-document-buc...Geir Storli2018-02-022-8/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Reduce use of document::BucketSpace::placeHolder() in storageapiTor Egge2018-02-022-8/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4876 from vespa-engine/jvenstad/dont-revalidate-applicati...Jon Marius Venstad2018-02-025-52/+64
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unused token and make tests complyJon Marius Venstad2018-02-025-24/+11
| * | | | | | Create application in Athenz only for defaultsJon Marius Venstad2018-02-021-7/+2
| * | | | | | Lower limit of new apps and tenants to 20 chars againJon Marius Venstad2018-02-011-2/+2
| * | | | | | Add testJon Marius Venstad2018-02-013-28/+63