summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Handle import of array of struct fields, map of struct fields, and map ofTor Egge2018-11-2717-30/+676
* Merge pull request #7777 from vespa-engine/bratseth/import-model-integration-...Jon Bratseth2018-11-271-0/+7
|\
| * Import ai.vespa.rankingexpression.importer.configmodelviewJon Bratseth2018-11-271-0/+1
| * Import model-integration into config-model-fatJon Bratseth2018-11-271-0/+6
* | Merge pull request #7776 from vespa-engine/hakonhall/use-correct-inject-for-c...Håkon Hallingstad2018-11-271-1/+2
|\ \ | |/ |/|
| * Use correct Inject for componentsHåkon Hallingstad2018-11-271-1/+2
|/
* Merge pull request #7775 from vespa-engine/bratseth/model-compatibilityJon Bratseth2018-11-272-0/+104
|\
| * Temporary re-add for compatibility in CDJon Bratseth2018-11-272-0/+104
* | Merge pull request #7774 from vespa-engine/hakonhall/remove-redundant-utils-i...Håkon Hallingstad2018-11-272-44/+7
|\ \ | |/ |/|
| * Remove redundant utils in IOExceptionUtilHåkon Hallingstad2018-11-272-44/+7
|/
* Merge pull request #7773 from vespa-engine/bratseth/config-model-api-under-mo...Henning Baldersheim2018-11-2634-38/+46
|\
| * Create a config model view (api) package under model-integrationJon Bratseth2018-11-2634-38/+46
|/
* Merge pull request #7772 from vespa-engine/bratseth/install-config-model-apiJon Bratseth2018-11-261-0/+1
|\
| * Install config model APIJon Bratseth2018-11-261-0/+1
|/
* Merge pull request #7760 from vespa-engine/hakonhall/new-flags-moduleHåkon Hallingstad2018-11-2622-12/+733
|\
| * Require default value for FeatureFlagHåkon Hallingstad2018-11-262-15/+7
| * Remove Optional classesHåkon Hallingstad2018-11-267-148/+72
| * Remove change to jacksonClass typeHåkon Hallingstad2018-11-251-1/+1
| * Replace timeout- with io-exceptionHåkon Hallingstad2018-11-252-4/+3
| * Add flags moduleHåkon Hallingstad2018-11-2324-12/+818
* | Merge pull request #7766 from vespa-engine/toregge/do-not-add-imported-struct...Tor Egge2018-11-261-0/+1
|\ \
| * | Don't add imported array of struct/map of struct/map of primitiveTor Egge2018-11-261-0/+1
* | | Merge pull request #7764 from vespa-engine/toregge/handle-imported-attributes...Tor Egge2018-11-261-6/+6
|\ \ \
| * | | Handle imported attributes in AttributeCombinerDFW.Tor Egge2018-11-261-6/+6
| |/ /
* | | Merge pull request #7769 from vespa-engine/bratseth/move-model-integration-apiHarald Musum2018-11-2634-235/+278
|\ \ \
| * | | Model the config model view of model-integrationJon Bratseth2018-11-2634-235/+278
| |/ /
* | | Merge pull request #7768 from vespa-engine/bjorncs/fixBjørn Christian Seime2018-11-266-13/+158
|\ \ \
| * | | Escape '!' which is also a regex meta characterBjørn Christian Seime2018-11-262-6/+6
| * | | Allow empty 'required-credentials'Bjørn Christian Seime2018-11-262-3/+3
| * | | Make 'roles' field optionalBjørn Christian Seime2018-11-262-5/+7
| * | | Disallow empty 'authorized-peers' fieldBjørn Christian Seime2018-11-264-5/+47
| * | | Add glob pattern matching for host expressionsBjørn Christian Seime2018-11-262-0/+101
| |/ /
* | | Merge pull request #7767 from vespa-engine/arnej/add-forward-compatible-xml-r...Jon Bratseth2018-11-261-0/+421
|\ \ \ | |/ / |/| |
| * | add XmlRenderer from 7 branchArne Juul2018-11-261-0/+421
|/ /
* | Merge pull request #7763 from vespa-engine/hakonhall/ignore-nosuchfileexcepti...Jon Bratseth2018-11-2614-23/+81
|\ \
| * | Allow ignoring any IOExceptionHåkon Hallingstad2018-11-263-24/+39
| * | remove references to IOExceptionUtilHåkon Hallingstad2018-11-2513-13/+26
| * | Ignore NoSuchFileException with ifExistsHåkon Hallingstad2018-11-252-8/+38
* | | Merge pull request #7758 from vespa-engine/ollivir/adaptive-timeoutJon Bratseth2018-11-2617-85/+507
|\ \ \
| * | | Adaptive timeout support in java dispatchOlli Virtanen2018-11-2317-85/+507
* | | | Merge pull request #7762 from vespa-engine/bratseth/use-java-type-only-interfaceHenning Baldersheim2018-11-2510-68/+176
|\ \ \ \ | |_|/ / |/| | |
| * | | Java type only interface between imported-models and config modelsJon Bratseth2018-11-2510-68/+176
|/ / /
* | | Merge pull request #7761 from vespa-engine/balder/use-provided-scopeHenning Baldersheim2018-11-242-2/+1
|\ \ \
| * | | Remove unused importHenning Baldersheim2018-11-241-2/+0
| * | | Use provided scope to avoid class cast issuesHenning Baldersheim2018-11-241-0/+1
|/ / /
* | | Merge pull request #7756 from vespa-engine/bratseth/optionally-exclude-jniHenning Baldersheim2018-11-231-0/+26
|\ \ \
| * | | Optionally exclude TF JNIJon Bratseth2018-11-231-0/+26
* | | | Merge pull request #7753 from vespa-engine/geirst/remove-enable-multiple-buck...Tor Brede Vekterli2018-11-2319-161/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Remove experimental enable-multiple-bucket-spaces flag.Geir Storli2018-11-2319-161/+30
* | | | Merge pull request #7755 from vespa-engine/balder/a-little-less-agressive-ini...Henning Baldersheim2018-11-231-1/+1
|\ \ \ \ | |_|/ / |/| | |