summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Aressem/remove post install script""Arnstein Ressem2017-09-271-0/+10
|
* Revert "Aressem/remove post install script"Arnstein Ressem2017-09-271-10/+0
|
* Merge pull request #3554 from vespa-engine/aressem/remove-post-install-scriptArnstein Ressem2017-09-271-0/+10
|\ | | | | Aressem/remove post install script
| * Remove global install of files and put this in the modules that owns them.Arnstein Ressem2017-09-251-0/+10
| |
* | Temoporary permission to kill the bad guys have been revoken.Henning Baldersheim2017-09-272-4/+4
| | | | | | | | | | Alert level has now been reduced to green as the infamous ones has been taken out. So no need to bring along an armed cop anymore.
* | Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgradeMartin Polden2017-09-262-0/+9
|\ \ | |/ |/| Read block-upgrade tag from deployment spec
| * 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-227-81/+11
|\ \ | | | | | | | | | | | | Conflicts: vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java
| * \ 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 fields
| | * | Avoid the phrase 'boolean search' for predicate fieldsJon Bratseth2017-09-213-8/+9
| | |/ | | | | | | | | | | | | This is to avoid any confusion with boolean search in the meaning of combining query operators with boolean combinators.
| * / Add locks to ComponentsProviderImplValerij Fredriksen2017-09-221-0/+1
| |/
| * Merge pull request #3471 from ↵Jon Bratseth2017-09-201-1/+1
| |\ | | | | | | | | | | | | vespa-engine/vekterli/remove-outdated-copyright-notices Remove or update outdated copyright notices
| | * 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
| | | | | | | | | | - To prevent import-package for its packages. - scala-xml is only used to generate config classes, and is not needed or provided runtime. - Add scala-xml in scope test where it's used in unit tests. - Do not exclude scala-xml from config-bundle until the oldest active config model uses the new Java version of createClassName.
* 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
| | | | | | | - To prevent import-package for its packages. - scala-xml is only used to generate config classes, and is not needed or provided runtime. - Add scala-xml in scope test where it's used in unit tests.
* Merge pull request #3348 from vespa-engine/arnej/add-metrics-display-namegjoranv2017-09-065-6/+31
|\ | | | | Arnej/add metrics display name
| * 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
| | | | | | | | This reverts commit f6ec274aab8d1b4d2ac25c104bc5a603dc4156ff.
| * Revert "Exclude scala-xml from provided classpath"gjoranv2017-09-011-5/+0
| | | | | | | | This reverts commit 2bcc584022f761efa9968a3c126608b559b8fedb.
| * Merge branch 'master' into gjoranv/exclude-scala-xmlgjoranv2017-08-3121-55/+123
| |\
| * | Exclude scala-xml from provided classpathgjoranv2017-08-311-0/+5
| | | | | | | | | | | | | | | | | | | | | - To prevent import-package for its packages. - scala-xml is only used to generate config classes, and is not needed or provided runtime. - Add scala-xml in scope test where it's used in unit tests.
| * | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-08-312-13/+7
| | | | | | | | | | | | | | | | | | - In new class ConfiggenUtil. - This allows using the function without loading classes from scala-xml.
* | | Revert "Keep using the deprecated createClassName method for now."gjoranv2017-09-052-4/+5
| | | | | | | | | | | | This reverts commit 121785959820d1f3803a160b589644685e9684e9.
* | | Keep using the deprecated createClassName method for now.gjoranv2017-09-052-5/+4
| | |
* | | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-09-052-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | - In new class ConfiggenUtil. - This will allow using the function without loading classes from scala-xml in the future. - Do not remove the original scala method, as it could still be used for a while by older config models. (By classes InstanceResolver and VespaModel.)
* | | Merge branch 'master' into ↵Harald Musum2017-08-313-6/+5
|\ \ \ | | |/ | |/| | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files
| * | 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 ↵Henning Baldersheim2017-08-301-1/+1
| | | | | | | | | | | | that has earlier detection of missuse.
| * | Nonfunctional changesJon Bratseth2017-08-301-2/+1
| | |
* | | Merge branch 'master' into ↵Harald Musum2017-08-306-5/+67
|\| | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files
| * | 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""
| * | | Revert "Update unit test with "libvespamallocd""Arnstein Ressem2017-08-301-3/+3
| | | |
* | | | Merge pull request #3274 from ↵Harald Musum2017-08-301-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/revert-3264-balder/use-malloc-library-that-has-better-detection-of-error-usage Revert "Since we are having so many issues with libyell we need to use an all…"
| * | | Revert "Since we are having so many issues with libyell we need to use an ↵Arnstein Ressem2017-08-301-1/+1
| | | | | | | | | | | | | | | | all…"
* | | | Merge pull request #3260 from vespa-engine/hmusum/remove-version-from-def-filesgjoranv2017-08-302-2/+0
|\ \ \ \ | |/ / / |/| | | version in def files are deprecated