aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7830 from vespa-engine/bratseth/build-method-on-config-bu...gjoranv2018-12-036-7/+6
|\
| * Add build() method to config buildersJon Bratseth2018-11-306-7/+6
* | Revert "Merge pull request #7837 from vespa-engine/revert-7836-bratseth/remov...Jon Bratseth2018-12-025-16/+1
* | Merge pull request #7832 from vespa-engine/bratseth/deprecate-provisioning-ve...Harald Musum2018-12-025-18/+36
|\ \
| * | Deprecate com.yahoo.config.provision.VersionJon Bratseth2018-12-015-18/+36
| |/
* | Revert "Bratseth/remove unused rpc server take 3"Jon Bratseth2018-12-015-1/+16
* | Revert "Merge pull request #7835 from vespa-engine/revert-7833-bratseth/remov...Jon Bratseth2018-12-015-16/+1
* | Revert "Bratseth/remove unused rpc server take 2"Jon Bratseth2018-12-015-1/+16
* | Register the container with SlobrokJon Bratseth2018-12-011-1/+1
* | Revert "Merge pull request #7831 from vespa-engine/revert-7818-bratseth/remov...Jon Bratseth2018-12-015-15/+0
* | Revert "Remove zombie code"Håkon Hallingstad2018-12-015-0/+15
|/
* Merge pull request #7823 from vespa-engine/toregge/derive-config-for-imported...Geir Storli2018-11-3011-7/+221
|\
| * Remove irrelevant derived config.Tor Egge2018-11-301-8/+0
| * Trim down unit tests.Tor Egge2018-11-301-36/+3
| * Derive config for imported position field.Tor Egge2018-11-3012-7/+262
* | Merge pull request #7824 from vespa-engine/ollivir/adaptive-timeout-fixesJon Bratseth2018-11-301-1/+1
|\ \
| * | Fixes to adaptive timeout handlingOlli Virtanen2018-11-291-1/+1
* | | Expect the right handlersJon Bratseth2018-11-291-1/+0
* | | Remove zombie codeJon Bratseth2018-11-294-14/+0
| |/ |/|
* | Revert "Revert "Always output tensor type in toString""Jon Bratseth2018-11-291-6/+6
|/
* Merge pull request #7811 from vespa-engine/toregge/fail-duplicate-importGeir Storli2018-11-293-1/+21
|\
| * Fail duplicate import of field.Tor Egge2018-11-293-1/+21
* | Revert "Always output tensor type in toString"Håkon Hallingstad2018-11-291-6/+6
|/
* Merge pull request #7808 from vespa-engine/bratseth/always-output-tensor-type...Lester Solbakken2018-11-291-6/+6
|\
| * Always output tensor type in toStringJon Bratseth2018-11-281-6/+6
* | Merge pull request #7805 from vespa-engine/bratseth/allow-zero-arg-parenthesisLester Solbakken2018-11-291-1/+1
|\ \
| * | Allow no-arg function invocations to use parenthesesJon Bratseth2018-11-281-1/+1
| |/
* | Don't emit unneeded index-info config for inner struct in map of struct.Tor Egge2018-11-282-20/+4
* | Generate index info config for imported complex fields.Tor Egge2018-11-282-1/+39
* | Improve attribute detection when generating index-info config.Tor Egge2018-11-282-18/+47
* | 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
|/
* Create a config model view (api) package under model-integrationJon Bratseth2018-11-2626-30/+30
* 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
* | Model the config model view of model-integrationJon Bratseth2018-11-2626-116/+117
|/
* Merge pull request #7758 from vespa-engine/ollivir/adaptive-timeoutJon Bratseth2018-11-261-0/+9
|\
| * Adaptive timeout support in java dispatchOlli Virtanen2018-11-231-0/+9
* | Java type only interface between imported-models and config modelsJon Bratseth2018-11-251-15/+36
* | Remove unused importHenning Baldersheim2018-11-241-2/+0
* | Remove experimental enable-multiple-bucket-spaces flag.Geir Storli2018-11-234-69/+13
|/
* Merge pull request #7744 from vespa-engine/bratseth/move-tf-out-of-config-modelJon Bratseth2018-11-2327-66/+113
|\
| * Move all importing to model-integrationJon Bratseth2018-11-2227-35/+35
| * Restore old package nameJon Bratseth2018-11-2226-29/+29
| * Separate model integration into a separate moduleJon Bratseth2018-11-2127-64/+111
* | Add unit test for position zcurve field not being part of [document] fieldsetTor Brede Vekterli2018-11-224-1/+53
* | exclude "extra" fields from [document] field-setArne Juul2018-11-226-22/+11
* | Keep the old default until tested in a full zone.Henning Baldersheim2018-11-214-11/+4
* | Avoid * importsHenning Baldersheim2018-11-211-2/+11
* | Follow api change.Henning Baldersheim2018-11-212-4/+2