summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Revert "Freva/node admin shutdown"Valerij Fredriksen2017-09-221-1/+0
* Merge branch 'master' into bratseth/nonfunctional-changes-4Arne Juul2017-09-227-81/+11
|\
| * Merge pull request #3493 from vespa-engine/bratseth/avoid-boolean-search-phraseBjørn Christian Seime2017-09-223-8/+9
| |\
| | * Avoid the phrase 'boolean search' for predicate fieldsJon Bratseth2017-09-213-8/+9
| * | Add locks to ComponentsProviderImplValerij Fredriksen2017-09-221-0/+1
| |/
| * Merge pull request #3471 from vespa-engine/vekterli/remove-outdated-copyright...Jon Bratseth2017-09-201-1/+1
| |\
| | * Remove or update outdated copyright noticesTor Brede Vekterli2017-09-201-1/+1
| * | Remove persistence provider config from proton config.Tor Egge2017-09-201-1/+0
| |/
| * garbage collect outdated scriptsArne Juul2017-09-191-71/+0
* | Merge with masterJon Bratseth2017-09-151-1/+1
|/
* Set hwinfo in proton config based on node flavor.Geir Storli2017-09-152-0/+18
* Remove ClusterMemberInfoConfigMartin Polden2017-09-131-9/+1
* simplify single node caseArne Juul2017-09-113-12/+5
* Exclude scala-xml from provided classpathgjoranv2017-09-081-0/+5
* Fix deployment spec cast in container cluster modelMartin Polden2017-09-084-20/+67
* Revert "Exclude scala-xml from provided classpath"gjoranv2017-09-071-5/+0
* Exclude scala-xml from provided classpathgjoranv2017-09-071-0/+5
* Merge pull request #3348 from vespa-engine/arnej/add-metrics-display-namegjoranv2017-09-065-6/+31
|\
| * unit test "display-name"Arne Juul2017-09-051-2/+13
| * escape japaneseArne Juul2017-09-051-1/+1
| * add "display-name" attribute for metricsArne Juul2017-09-053-3/+17
| * Revert "Rewrite ConfigGenerator.createClassName to Java."gjoranv2017-09-012-7/+13
| * Revert "Exclude scala-xml from provided classpath"gjoranv2017-09-011-5/+0
| * Merge branch 'master' into gjoranv/exclude-scala-xmlgjoranv2017-08-3121-55/+123
| |\
| * | Exclude scala-xml from provided classpathgjoranv2017-08-311-0/+5
| * | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-08-312-13/+7
* | | Revert "Keep using the deprecated createClassName method for now."gjoranv2017-09-052-4/+5
* | | Keep using the deprecated createClassName method for now.gjoranv2017-09-052-5/+4
* | | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-09-052-13/+7
* | | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from...Harald Musum2017-08-313-6/+5
|\ \ \ | | |/ | |/|
| * | Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
| * | Since we are having so many issues with libyell we need to use an allocator t...Henning Baldersheim2017-08-301-1/+1
| * | Nonfunctional changesJon Bratseth2017-08-301-2/+1
* | | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from...Harald Musum2017-08-306-5/+67
|\| |
| * | Read parallel tag from deployment.xmlMartin Polden2017-08-306-5/+67
* | | Revert "Revert "version in def files are deprecated""Harald Musum2017-08-302-2/+0
* | | Revert "version in def files are deprecated"Harald Musum2017-08-302-0/+2
* | | Merge pull request #3273 from vespa-engine/revert-3265-jvenstad/fix-unit-testHarald Musum2017-08-301-3/+3
|\ \ \
| * | | Revert "Update unit test with "libvespamallocd""Arnstein Ressem2017-08-301-3/+3
* | | | Merge pull request #3274 from vespa-engine/revert-3264-balder/use-malloc-libr...Harald Musum2017-08-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Since we are having so many issues with libyell we need to use an all...Arnstein Ressem2017-08-301-1/+1
* | | | Merge pull request #3260 from vespa-engine/hmusum/remove-version-from-def-filesgjoranv2017-08-302-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | version in def files are deprecatedHarald Musum2017-08-302-2/+0
| |/ /
* | | Merge pull request #3265 from vespa-engine/jvenstad/fix-unit-testJon Bratseth2017-08-301-3/+3
|\ \ \
| * | | Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
* | | | Since we are having so many issues with libyell we need to use an allocator t...Henning Baldersheim2017-08-301-1/+1
| |/ / |/| |
* | | Merge pull request #3234 from vespa-engine/bratseth/store-provisioninfo-witho...Jon Bratseth2017-08-307-21/+28
|\ \ \
| * \ \ Merge with masterJon Bratseth2017-08-285-38/+203
| |\ \ \ | | | |/ | | |/|
| * | | Add one wimphy testJon Bratseth2017-08-281-4/+14
| * | | Track API changes, remove warningsJon Bratseth2017-08-281-2/+3