summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* fix warningsArne H Juul2017-04-202-0/+2
* Merge pull request #2200 from yahoo/hmusum/rename-and-simplify-hostgjoranv2017-04-206-26/+20
|\
| * Preserve orderHarald Musum2017-04-201-1/+3
| * Rename variable and rename and simplify methods for getting hostsHarald Musum2017-04-206-26/+18
* | Always pass wanted Vespa versionJon Bratseth2017-04-1916-75/+117
* | Always have wanted node version (WIP)Jon Bratseth2017-04-181-12/+19
* | Merge branch 'master' into bratseth/receive-wanted-versionJon Bratseth2017-04-1832-329/+243
|\|
| * Merge pull request #2174 from yahoo/hmusum/remove-searchdefinitions-syntaxgjoranv2017-04-1813-256/+0
| |\
| | * Remove unused apps and fix no longer valid <searchdefinitions> in services.xmlHarald Musum2017-04-0613-256/+0
| * | Change soLingerTime unit from milliseconds to secondsBjørn Christian Seime2017-04-182-2/+2
| * | Merge pull request #2167 from yahoo/gjoranv/add-flavor-to-zk-appgjoranv2017-04-071-7/+6
| |\ \ | | |/ | |/|
| | * Add flavor to VespaModel ProvisionInfos.gjoranv2017-04-041-7/+6
| * | Merge pull request #2148 from yahoo/bjorncs/forbid-fast-access-prediate-tenso...Geir Storli2017-04-053-0/+113
| |\ \
| | * | Use joinLines + add reference fieldBjørn Christian Seime2017-04-051-17/+30
| | * | Forbid fast-access for predicate, tensor and reference attributesBjørn Christian Seime2017-04-043-0/+100
| | |/
| * | Add data and collection type to imported-fields config.Geir Storli2017-04-057-1/+59
| * | Make document types in imported fields test more generic to prepare for more ...Geir Storli2017-04-0512-64/+64
| |/
* / Pass wanted node Vespa version aroundJon Bratseth2017-04-079-18/+40
|/
* Merge pull request #2136 from yahoo/bjorncs/forbid-document-references-in-str...Bjørn Christian Seime2017-04-036-8/+92
|\
| * Forbid document references in streaming searchBjørn Christian Seime2017-04-036-8/+92
* | Turn on 16 distribution bits in us-central-1Jon Bratseth2017-04-031-1/+2
|/
* Merge pull request #2130 from yahoo/gjoranv/add-loggerHarald Musum2017-04-031-0/+3
|\
| * Add logger to HostSystem, instead of using inherited logger.gjoranv2017-04-031-0/+3
* | Simplify getFieldBjørn Christian Seime2017-04-031-5/+1
* | Don't add imported fields to default summaryBjørn Christian Seime2017-04-032-7/+3
* | Refactor fixture setup into separate methods for better readabilityBjørn Christian Seime2017-04-032-30/+42
* | Add attribute transform to summary fields of imported fieldsBjørn Christian Seime2017-04-036-1/+115
* | Verify validation of types in summary fieldsBjørn Christian Seime2017-04-031-0/+59
* | Remove dangling Javadoc parameter descriptionBjørn Christian Seime2017-04-031-1/+0
* | Add document summary to imported fields testBjørn Christian Seime2017-04-033-0/+44
* | Remove summary transform for implicit reference field sourceBjørn Christian Seime2017-04-034-0/+36
* | Include imported fields when validating field typesBjørn Christian Seime2017-04-031-6/+5
* | Allow any document field as source for summary fieldBjørn Christian Seime2017-04-033-8/+12
|/
* Revert "Bjorncs/summary config imported fields"gjoranv2017-03-3117-284/+21
* Merge pull request #2111 from yahoo/bjorncs/summary-config-imported-fieldsGeir Storli2017-03-3117-21/+284
|\
| * Don't add reference fields to default summaryBjørn Christian Seime2017-03-311-1/+1
| * Refactor fixture setup into separate methods for better readabilityBjørn Christian Seime2017-03-312-30/+42
| * Add attribute transform to summary fields of imported fieldsBjørn Christian Seime2017-03-306-1/+115
| * Verify validation of types in summary fieldsBjørn Christian Seime2017-03-301-0/+59
| * Remove dangling Javadoc parameter descriptionBjørn Christian Seime2017-03-301-1/+0
| * Add document summary to imported fields testBjørn Christian Seime2017-03-303-0/+44
| * Remove summary transform for implicit reference field sourceBjørn Christian Seime2017-03-304-0/+36
| * Include imported fields when validating field typesBjørn Christian Seime2017-03-301-6/+5
| * Allow any document field as source for summary fieldBjørn Christian Seime2017-03-303-8/+12
| * Simplify getFieldBjørn Christian Seime2017-03-291-5/+1
* | Merge pull request #2119 from yahoo/hmusum/increase-heap-size-for-containerHenning Baldersheim2017-03-313-5/+4
|\ \
| * | Increase heap size for JVM for containerHarald Musum2017-03-313-5/+4
| |/
* / Convert Scala code to JavaBjørn Christian Seime2017-03-304-351/+334
|/
* Misc simplifications and code style cleanups.Geir Storli2017-03-284-9/+10
* Simplify some code by using TestUtil.joinLines().Geir Storli2017-03-284-99/+105