summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.316.12-1].vespa-6.316.12-1by-screwdriver2018-11-284-1/+2
* Merge pull request #7779 from vespa-engine/toregge/derive-config-for-imported...Geir Storli2018-11-2717-30/+670
|\
| * Fix typo.Tor Egge2018-11-272-31/+25
| * Handle import of array of struct fields, map of struct fields, and map ofTor Egge2018-11-2717-30/+676
* | Merge pull request #7782 from vespa-engine/mpolden/node-repo-flagsMartin Polden2018-11-2714-20/+566
|\ \
| * | SimplifyMartin Polden2018-11-272-43/+20
| * | Support feature flags in node repositoryMartin Polden2018-11-2714-20/+589
* | | Merge pull request #7781 from vespa-engine/ollivir/invoker-factory-bugfixHarald Musum2018-11-272-3/+1
|\ \ \ | |/ / |/| |
| * | Remove duplicated setResponseMonitor callOlli Virtanen2018-11-271-2/+0
| * | Remove extra parameter from call to List.addOlli Virtanen2018-11-271-1/+1
|/ /
* | Merge pull request #7771 from vespa-engine/bjorncs/tls-certificate-validationBjørn Christian Seime2018-11-276-0/+286
|\ \
| * | Use AssertJ to improve assertionsBjørn Christian Seime2018-11-273-17/+25
| * | Add PeerAuthorizerBjørn Christian Seime2018-11-264-0/+278
* | | Merge pull request #7770 from vespa-engine/vekterli/support-test-and-set-with...Tor Brede Vekterli2018-11-279-36/+112
|\ \ \ | |_|/ |/| |
| * | Support test-and-set for auto-create document updatesTor Brede Vekterli2018-11-269-36/+112
* | | 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