aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Use builderMartin Polden2020-03-201-6/+6
* Allocate dedicated nodes when no nodes are specifiedMartin Polden2020-03-204-26/+84
* Revert "Satisfy capacity requirement when allocating without nodes tag"Harald Musum2020-03-193-52/+84
* Fix domain ordering in error message + use raw valueBjørn Christian Seime2020-03-181-1/+1
* Reapply #12601Bjørn Christian Seime2020-03-186-27/+110
* Merge pull request #12610 from vespa-engine/mpolden/avoid-magic-combined-reduxMartin Polden2020-03-183-84/+52
|\
| * Satisfy capacity requirement when allocating without nodes tagMartin Polden2020-03-183-33/+42
| * Missing node specification allocates one node per clusterMartin Polden2020-03-182-57/+16
* | Revert "Bjorncs/implicit access control"Bjørn Christian Seime2020-03-186-110/+27
|/
* Merge pull request #12601 from vespa-engine/bjorncs/implicit-access-controlBjørn Christian Seime2020-03-186-27/+110
|\
| * Fix check for non-identical domainsBjørn Christian Seime2020-03-181-1/+1
| * Test that access control is implicitly added for hosted appsBjørn Christian Seime2020-03-171-1/+24
| * Add Athenz domain to TestPropertiesBjørn Christian Seime2020-03-171-0/+8
| * Prefer Athenz domain from deploy propertiesBjørn Christian Seime2020-03-172-4/+29
| * Add implicit access control for hosted tenant applicationsBjørn Christian Seime2020-03-171-4/+30
| * Combine 'setHandlers' + 'setServlets' to single methodBjørn Christian Seime2020-03-172-11/+4
| * Group public methods above privateBjørn Christian Seime2020-03-171-4/+4
| * Make method privateBjørn Christian Seime2020-03-171-1/+2
| * Move call to 'addImplicitHttpIfPresent' up one level and renameBjørn Christian Seime2020-03-171-2/+2
| * Extract to method 'isHostedTenantApplication'Bjørn Christian Seime2020-03-171-3/+9
* | Merge pull request #12566 from vespa-engine/gjoranv/allow-stealing-builtin-ha...gjoranv2020-03-189-36/+146
|\ \
| * | Add VipHandler binding to reserved bindingsgjoranv2020-03-172-5/+9
| * | Verify that reserved bindings cannot be stolen.gjoranv2020-03-161-0/+18
| * | Update test to check that handler has no bindingsgjoranv2020-03-161-4/+10
| * | Add unit test.gjoranv2020-03-131-2/+22
| * | Add state/v1 bindings to set of reserved bindings.gjoranv2020-03-132-5/+10
| * | Add metrics/v2 bindings to set of reserved bindings.gjoranv2020-03-132-3/+8
| * | Allow user handlers to take over bindings from builtin handlers.gjoranv2020-03-132-1/+36
| * | Store serverBindings in a Set instead of Listgjoranv2020-03-131-3/+5
| * | Set up user handlers latergjoranv2020-03-132-8/+5
| * | Limit accessgjoranv2020-03-131-1/+1
| * | Add 'cluster' as a field in handler builder classes.gjoranv2020-03-133-3/+16
| * | minor: rename parametergjoranv2020-03-132-4/+4
| * | Rename method to reflect its purpose.gjoranv2020-03-132-3/+3
| * | Use constants for search handler class + bindinggjoranv2020-03-132-2/+7
* | | Merge branch 'master' into hmusum/builder-for-clusterspecHarald Musum2020-03-18106-390/+421
|\ \ \
| * | | Revert "Missing node specification allocates one node per cluster"Harald Musum2020-03-182-16/+59
| * | | Merge pull request #12598 from vespa-engine/vekterli/expose-internal-merge-la...Henning Baldersheim2020-03-171-0/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Expose internal merge latency metricsTor Brede Vekterli2020-03-171-0/+9
| * | | Merge pull request #12591 from vespa-engine/mortent/deploy-with-athenzdomainMorten Tokle2020-03-171-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Provide AthenzDomain to config-modelMorten Tokle2020-03-171-1/+1
| * | | Merge pull request #12592 from vespa-engine/bjorncs/remove-application-overri...Bjørn Christian Seime2020-03-175-28/+4
| |\ \ \
| | * | | Remove support for overriding application id in access-controlBjørn Christian Seime2020-03-175-28/+4
| | |/ /
| * | | Correctly read expression files from both schemas/ and searchdefinitions/Jon Bratseth2020-03-171-2/+2
| * | | Revert "Merge pull request #12565 from vespa-engine/revert-12563-bratseth/sea...Jon Bratseth2020-03-1798-347/+350
| |/ /
* | | Use two builder methods, request() and specification()Harald Musum2020-03-174-8/+6
* | | Add builder for ClusterSpecHarald Musum2020-03-174-38/+24
|/ /
* | Remove Vespa domain from AccessControlBjørn Christian Seime2020-03-164-19/+4
* | Merge pull request #12579 from vespa-engine/hmusum/remove-unused-code-4gjoranv2020-03-161-33/+5
|\ \
| * | Remove unused methodsHarald Musum2020-03-161-33/+5