summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Test that 'reference' is a valid field nameBjørn Christian Seime2017-01-242-0/+5
* Merge pull request #1587 from yahoo/gjoranv/use-guavaBjørn Christian Seime2017-01-241-6/+3
|\
| * Use guava for initializing map.gjoranv2017-01-241-6/+3
* | Allow 'reference' as identifierBjørn Christian Seime2017-01-241-0/+1
|/
* Merge pull request #1579 from yahoo/geirst/parsing-of-imported-fields-in-sd-fileGeir Storli2017-01-238-4/+200
|\
| * Remove empty constructor.Geir Storli2017-01-231-2/+0
| * Add copyright headers.Geir Storli2017-01-235-0/+5
| * Add parsing of imported fields in SD file.Geir Storli2017-01-238-4/+197
* | Merge pull request #1575 from yahoo/bjorncs/add-reference-typeBjørn Christian Seime2017-01-233-4/+113
|\ \
| * | Add class description and copyright headerBjørn Christian Seime2017-01-231-0/+4
| * | Add unit test for reference field parsingBjørn Christian Seime2017-01-231-0/+49
| * | Support reference fields in SD parserBjørn Christian Seime2017-01-231-0/+15
| * | Add AST type for reference fieldBjørn Christian Seime2017-01-231-0/+41
| * | Improve indentationBjørn Christian Seime2017-01-201-4/+4
| |/
* | Remove ancient TODO.gjoranv2017-01-231-1/+0
* | Set up http after all components that set up http bindings.gjoranv2017-01-231-6/+7
|/
* Merge pull request #1519 from yahoo/bratseth/tensors-in-summaryJon Bratseth2017-01-203-14/+14
|\
| * Merge with masterJon Bratseth2017-01-1815-337/+201
| |\
| * | Add tensor document summary fieldJon Bratseth2017-01-161-1/+1
| * | Output tensor fields in summary config as type tensor instead of jsonstringJon Bratseth2017-01-133-29/+29
* | | Add/improve README'sJon Bratseth2017-01-191-1/+3
* | | Remove duplicate code patternBjørn Christian Seime2017-01-181-51/+69
| |/ |/|
* | Merge pull request #1522 from yahoo/bratseth/support-compressed-json-constantsHåvard Pettersen2017-01-175-53/+71
|\ \
| * | Validate constant file names and bypass cointent validation for compressed filesJon Bratseth2017-01-175-49/+61
| * | Nonfunctional changes onlyJon Bratseth2017-01-173-6/+12
* | | Relax summary field tensor type compatibility checkJon Bratseth2017-01-174-51/+64
* | | Revert "Revert "Revert "Revert "Bratseth/tensor type info in documents""""Jon Bratseth2017-01-1767-326/+892
|/ /
* | Revert "Revert "Revert "Bratseth/tensor type info in documents"""Henning Baldersheim2017-01-1667-892/+326
* | Merge pull request #1503 from yahoo/revert-1502-revert-1495-bratseth/tensor-t...Jon Bratseth2017-01-1667-326/+892
|\|
| * Revert "Revert "Bratseth/tensor type info in documents""Jon Bratseth2017-01-1267-326/+892
* | Merge pull request #1488 from yahoo/gjoranv/access-control-preparationsgjoranv2017-01-166-256/+89
|\ \ | |/ |/|
| * Move remaining parts of search.rnc into content.rnc.gjoranv2017-01-113-90/+87
| * Remove support for 'qrservers' from rnc schema.gjoranv2017-01-111-100/+0
| * Remove 'qrservers' from search.rnc.gjoranv2017-01-111-52/+0
| * Remove workarounds for 'qrservers' syntax.gjoranv2017-01-112-13/+1
| * Add TODO for removing legacy 'filter' under 'jdisc'gjoranv2017-01-111-1/+1
* | Revert "Bratseth/tensor type info in documents"Jon Bratseth2017-01-1267-892/+326
* | Merge pull request #1495 from yahoo/bratseth/tensor-type-info-in-documentsJon Bratseth2017-01-1267-326/+892
|\ \
| * \ Merge branch 'master' into bratseth/tensor-type-info-in-documentsJon Bratseth2017-01-121-1/+0
| |\ \
| * | | Tensor type information in tensor document fieldsJon Bratseth2017-01-1265-282/+867
| * | | Maintain TensorType in documentsJon Bratseth2017-01-104-56/+37
| | |/ | |/|
* | | Improve name.Haakon Dybdahl2017-01-121-1/+1
* | | Update with new overrides.Haakon Dybdahl2017-01-121-1/+2
| |/ |/|
* | Remove support for 'chain' under 'http'.gjoranv2017-01-111-1/+0
|/
* Merge pull request #1354 from yahoo/kraune/disklimit-0.8Geir Storli2017-01-021-1/+1
|\
| * set new disk feed block at 80%Kristian Aune2016-12-191-1/+1
* | Merge pull request #1381 from yahoo/bratseth/indexed-tensor-functionsHenning Baldersheim2016-12-223-1/+47
|\ \
| * | Add tensor generate functionsJon Bratseth2016-12-223-1/+47
* | | Remove methods and constants no longer in useHarald Musum2016-12-221-9/+0
* | | Revert "Remove methods and constants no longer in use"Harald Musum2016-12-221-0/+9