summaryrefslogtreecommitdiffstats
path: root/config-model/src
Commit message (Expand)AuthorAgeFilesLines
* Use imported fields config as part of verify ranksetup.Geir Storli2017-03-081-0/+6
* Remove unused methodsHarald Musum2017-03-061-12/+0
* Merge pull request #1890 from yahoo/bjorncs/validate-datatype-imported-fieldsGeir Storli2017-03-011-0/+37
|\
| * Verify that changing target type of reference field is not allowedBjørn Christian Seime2017-02-281-0/+37
* | Use deploy logger, and fix an obvious bug.gjoranv2017-02-281-3/+5
* | Merge pull request #1887 from yahoo/gjoranv/log-warning-for-http-server-configBjørn Christian Seime2017-02-281-0/+6
|\ \
| * | Log deprecation warning for 'container.jdisc.config.http-server'.gjoranv2017-02-281-0/+6
| |/
* / Remove pointless method for creating link to docHarald Musum2017-02-283-21/+2
|/
* Use primary cluster membership instead of the first one.gjoranv2017-02-281-2/+1
* Merge pull request #1878 from yahoo/gjoranv/hostsystem-improvementsJon Bratseth2017-02-284-35/+112
|\
| * Return ClusterMembership instead of ClusterSpec.gjoranv2017-02-282-5/+4
| * Add method and tests for primary cluster membership.gjoranv2017-02-282-1/+89
| * Rename method.gjoranv2017-02-281-7/+7
| * Use Flavor object instead of String.gjoranv2017-02-241-3/+4
| * Remove the 'mapping' map.gjoranv2017-02-242-24/+13
* | Stop using 3-arg getConfig method (will be removed)Harald Musum2017-02-262-42/+6
* | Remove attribute aspect of reference fields from summary.Geir Storli2017-02-248-0/+145
|/
* One TestUtil and joinLines() is enough.gjoranv2017-02-225-16/+4
* Declare method private.gjoranv2017-02-221-1/+1
* Static import method.gjoranv2017-02-221-1/+2
* Rename ConfigModelTestUtil -> TestUtilgjoranv2017-02-223-6/+6
* Support excluding access control bindings for servlets and rest-apis.gjoranv2017-02-227-17/+131
* Rename sets of handler bindings, for clarity.gjoranv2017-02-221-5/+5
* AccessControl owns a set of handlers.gjoranv2017-02-222-10/+23
* Move method that creates the bindings to AccessControl as a member.gjoranv2017-02-212-16/+16
* 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