aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into gjoranv/add-cluster-membership-to-hostgjoranv2017-02-213-27/+49
|\
| * Remove support for changing base port after a service has been initializedHarald Musum2017-02-202-26/+1
| * Add a test that proves that macro-inlining is broken.Henning Baldersheim2017-02-181-3/+48
* | Let HostResource own a set of cluster memberships.gjoranv2017-02-213-1/+46
* | Replace lambda with method reference.gjoranv2017-02-201-1/+1
* | Optimize importsgjoranv2017-02-201-3/+6
* | Rename variables to avoid confusion.gjoranv2017-02-191-5/+5
* | Set flavor when a host is addedgjoranv2017-02-191-1/+3
* | Simplify control flow.gjoranv2017-02-181-9/+4
|/
* Add helper function for adding attribute aspect to fieldBjørn Christian Seime2017-02-171-3/+7
* Enforce that reference fields must be an attributeBjørn Christian Seime2017-02-1710-40/+124
* Disallow reference field to refer to an index fieldBjørn Christian Seime2017-02-162-1/+17
* Merge pull request #1788 from yahoo/bjorncs/include-searchable-copiesTor Brede Vekterli2017-02-166-16/+99
|\
| * Validate that searchable copies matches redundancyBjørn Christian Seime2017-02-166-16/+99
* | Merge pull request #1781 from yahoo/gjoranv/access-control-application-idBjørn Christian Seime2017-02-151-5/+17
|\ \ | |/ |/|
| * Use the name of the deployed applicationgjoranv2017-02-151-5/+17
* | 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