summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1754 from yahoo/hmusum/cleanup-interfaceValerij Fredriksen2017-02-131-3/+10
|\
| * Clean up interfaceHarald Musum2017-02-111-3/+10
* | Argh, none of these were inherited....Henning Baldersheim2017-02-122-11/+28
|/
* Merge pull request #1734 from yahoo/geirst/imported-fields-config-derivingGeir Storli2017-02-1019-90/+221
|\
| * Align naming of imported fields across Java code and config.Geir Storli2017-02-0913-94/+89
| * Enforce that referenced fields must be attributes.Geir Storli2017-02-093-11/+28
| * Add deriving of imported fields config for the search backend.Geir Storli2017-02-098-9/+128
* | Support access-control in xml schema.gjoranv2017-02-103-0/+21
* | Make vespaDomain optional.gjoranv2017-02-092-7/+9
* | Revert "Move access control chain setup to amenders."gjoranv2017-02-092-1/+19
|/
* Merge pull request #1721 from yahoo/gjoranv/remove-access-control-chainBjørn Christian Seime2017-02-082-19/+1
|\
| * Move access control chain setup to amenders.gjoranv2017-02-082-19/+1
* | Merge pull request #1677 from yahoo/bjorncs/reorder-searchBjørn Christian Seime2017-02-083-50/+103
|\ \
| * | Improve naming of methods and variablesBjørn Christian Seime2017-02-082-12/+12
| * | Add referee contraint to Search ordererBjørn Christian Seime2017-02-033-28/+83
| * | Don't ignore dropped Search elements in assertOrderBjørn Christian Seime2017-02-031-17/+18
| * | Simplify using Java 8 goodiesBjørn Christian Seime2017-02-031-6/+3
* | | Merge pull request #1709 from yahoo/bjorncs/global-documentBjørn Christian Seime2017-02-0811-15/+456
|\ \ \ | |_|/ |/| |
| * | Rename convertDocumentReferences -> convertDocumentReferencesToNamesBjørn Christian Seime2017-02-081-2/+2
| * | Simplify unit testBjørn Christian Seime2017-02-081-41/+62
| * | Add information about redundancy in error messageBjørn Christian Seime2017-02-083-4/+15
| * | Minor changes from code review feedbackBjørn Christian Seime2017-02-082-2/+3
| * | Fix test that is missing document definition in services.xmlBjørn Christian Seime2017-02-071-0/+1
| * | Verify constraints on referred documents and global documentsBjørn Christian Seime2017-02-077-12/+312
| * | Determine the set of globally distributed documentsBjørn Christian Seime2017-02-073-2/+108
| * | Add global attribute to content elementBjørn Christian Seime2017-02-071-1/+2
* | | Support 'application' and 'vespa-domain'.gjoranv2017-02-074-7/+54
* | | Allow builder chaining.gjoranv2017-02-071-3/+6
|/ /
* | Merge pull request #1697 from yahoo/gjoranv/access-control-excludegjoranv2017-02-074-9/+96
|\ \
| * | Support domain, read and write attributes.gjoranv2017-02-074-9/+96
* | | Remove unused propertyHarald Musum2017-02-071-2/+0
|/ /
* | Skip 'jdisc' element where unnecessary.gjoranv2017-02-061-4/+5
* | Simplify tests.gjoranv2017-02-061-17/+16
* | Support excluding handlers from access control.gjoranv2017-02-063-6/+57
* | Remove clutter.gjoranv2017-02-061-5/+0
* | Merge pull request #1679 from yahoo/gjoranv/access-controlgjoranv2017-02-048-29/+226
|\ \
| * | Improve test.gjoranv2017-02-031-13/+11
| * | Use flatMap() and collect().gjoranv2017-02-031-6/+8
| * | Make constant list immutable and uppercase name.gjoranv2017-02-031-4/+4
| * | Use upper case for constants.gjoranv2017-02-031-6/+6
| * | Remove unnecessary imports.gjoranv2017-02-031-4/+0
| * | Import Binding class.gjoranv2017-02-032-5/+7
| * | Logic for setting up access control filter chain.gjoranv2017-02-038-29/+228
* | | Merge pull request #1681 from yahoo/geirst/fix-handling-of-reference-fields-i...Tor Brede Vekterli2017-02-035-8/+51
|\ \ \ | |_|/ |/| |
| * | Accept fields of type ReferenceDataType in search clusters.Geir Storli2017-02-033-8/+11
| * | Handle reference data type field in vsm fields.Geir Storli2017-02-032-0/+40
* | | Merge pull request #1671 from yahoo/bjorncs/search-orderingBjørn Christian Seime2017-02-034-9/+272
|\ \ \ | |/ / |/| |
| * | Detect cyclic document dependenciesBjørn Christian Seime2017-02-024-0/+270
| * | Remove redundant filteringBjørn Christian Seime2017-01-271-9/+2
* | | Merge pull request #1662 from yahoo/geirst/derive-reference-type-in-documentt...Tor Brede Vekterli2017-02-035-68/+438
|\ \ \