summaryrefslogtreecommitdiffstats
path: root/config-model/src
Commit message (Expand)AuthorAgeFilesLines
* Do not move the health port yet.Henning Baldersheim2017-10-031-1/+1
* Use a constant to avoid having divergent double bookeeping.Henning Baldersheim2017-10-021-6/+9
* Move healthport from offset 4 to 2 to keep tight port range.Henning Baldersheim2017-10-021-1/+1
* Merge pull request #3596 from vespa-engine/balder/remove-unused-rtcspecHenning Baldersheim2017-10-0210-104/+27
|\
| * Stay conservative and not reduce and remove ports.Henning Baldersheim2017-10-022-15/+15
| * Remove unused imports and imports by *.Henning Baldersheim2017-10-021-6/+12
| * Remove the persistenceProviderPort and ports meta for rpc and smrpHenning Baldersheim2017-09-2910-97/+29
| * Remove unused slime messaging port.Henning Baldersheim2017-09-291-6/+1
| * Remove unused rtcspec.Henning Baldersheim2017-09-291-10/+0
* | Merge pull request #3577 from vespa-engine/ldalves/expose-sentinel-metricsLeandro Alves2017-10-021-0/+12
|\ \ | |/ |/|
| * exposes sentinel metricsLeandro Alves2017-09-291-0/+12
* | Remove unnecessary expensive cleanupHarald Musum2017-09-291-1/+0
|/
* Temoporary permission to kill the bad guys have been revoken.Henning Baldersheim2017-09-272-4/+4
* Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgradeMartin Polden2017-09-262-0/+9
|\
| * Update schemaMartin Polden2017-09-252-0/+9
* | Create ClassLockingValerij Fredriksen2017-09-251-0/+1
* | Revert "Freva/node admin shutdown"Valerij Fredriksen2017-09-221-1/+0
* | Merge branch 'master' into bratseth/nonfunctional-changes-4Arne Juul2017-09-226-10/+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
| |/
* / 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
* Fix deployment spec cast in container cluster modelMartin Polden2017-09-084-20/+67
* 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
| * Merge branch 'master' into gjoranv/exclude-scala-xmlgjoranv2017-08-3121-55/+123
| |\
| * | 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
|\ \ \ \ | |/ / / |/| | |