Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Aressem/remove post install script"" | Arnstein Ressem | 2017-09-27 | 1 | -0/+10 |
| | |||||
* | Revert "Aressem/remove post install script" | Arnstein Ressem | 2017-09-27 | 1 | -10/+0 |
| | |||||
* | Merge pull request #3554 from vespa-engine/aressem/remove-post-install-script | Arnstein Ressem | 2017-09-27 | 1 | -0/+10 |
|\ | | | | | Aressem/remove post install script | ||||
| * | Remove global install of files and put this in the modules that owns them. | Arnstein Ressem | 2017-09-25 | 1 | -0/+10 |
| | | |||||
* | | Temoporary permission to kill the bad guys have been revoken. | Henning Baldersheim | 2017-09-27 | 2 | -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-upgrade | Martin Polden | 2017-09-26 | 2 | -0/+9 |
|\ \ | |/ |/| | Read block-upgrade tag from deployment spec | ||||
| * | Update schema | Martin Polden | 2017-09-25 | 2 | -0/+9 |
| | | |||||
* | | Create ClassLocking | Valerij Fredriksen | 2017-09-25 | 1 | -0/+1 |
| | | |||||
* | | Revert "Freva/node admin shutdown" | Valerij Fredriksen | 2017-09-22 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' into bratseth/nonfunctional-changes-4 | Arne Juul | 2017-09-22 | 7 | -81/+11 |
|\ \ | | | | | | | | | | | | | Conflicts: vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java | ||||
| * \ | Merge pull request #3493 from vespa-engine/bratseth/avoid-boolean-search-phrase | Bjørn Christian Seime | 2017-09-22 | 3 | -8/+9 |
| |\ \ | | | | | | | | | Avoid the phrase 'boolean search' for predicate fields | ||||
| | * | | Avoid the phrase 'boolean search' for predicate fields | Jon Bratseth | 2017-09-21 | 3 | -8/+9 |
| | |/ | | | | | | | | | | | | | This is to avoid any confusion with boolean search in the meaning of combining query operators with boolean combinators. | ||||
| * / | Add locks to ComponentsProviderImpl | Valerij Fredriksen | 2017-09-22 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #3471 from ↵ | Jon Bratseth | 2017-09-20 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | vespa-engine/vekterli/remove-outdated-copyright-notices Remove or update outdated copyright notices | ||||
| | * | Remove or update outdated copyright notices | Tor Brede Vekterli | 2017-09-20 | 1 | -1/+1 |
| | | | |||||
| * | | Remove persistence provider config from proton config. | Tor Egge | 2017-09-20 | 1 | -1/+0 |
| |/ | |||||
| * | garbage collect outdated scripts | Arne Juul | 2017-09-19 | 1 | -71/+0 |
| | | |||||
* | | Merge with master | Jon Bratseth | 2017-09-15 | 1 | -1/+1 |
|/ | |||||
* | Set hwinfo in proton config based on node flavor. | Geir Storli | 2017-09-15 | 2 | -0/+18 |
| | |||||
* | Remove ClusterMemberInfoConfig | Martin Polden | 2017-09-13 | 1 | -9/+1 |
| | |||||
* | simplify single node case | Arne Juul | 2017-09-11 | 3 | -12/+5 |
| | |||||
* | Exclude scala-xml from provided classpath | gjoranv | 2017-09-08 | 1 | -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 model | Martin Polden | 2017-09-08 | 4 | -20/+67 |
| | |||||
* | Revert "Exclude scala-xml from provided classpath" | gjoranv | 2017-09-07 | 1 | -5/+0 |
| | |||||
* | Exclude scala-xml from provided classpath | gjoranv | 2017-09-07 | 1 | -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-name | gjoranv | 2017-09-06 | 5 | -6/+31 |
|\ | | | | | Arnej/add metrics display name | ||||
| * | unit test "display-name" | Arne Juul | 2017-09-05 | 1 | -2/+13 |
| | | |||||
| * | escape japanese | Arne Juul | 2017-09-05 | 1 | -1/+1 |
| | | |||||
| * | add "display-name" attribute for metrics | Arne Juul | 2017-09-05 | 3 | -3/+17 |
| | | |||||
| * | Revert "Rewrite ConfigGenerator.createClassName to Java." | gjoranv | 2017-09-01 | 2 | -7/+13 |
| | | | | | | | | This reverts commit f6ec274aab8d1b4d2ac25c104bc5a603dc4156ff. | ||||
| * | Revert "Exclude scala-xml from provided classpath" | gjoranv | 2017-09-01 | 1 | -5/+0 |
| | | | | | | | | This reverts commit 2bcc584022f761efa9968a3c126608b559b8fedb. | ||||
| * | Merge branch 'master' into gjoranv/exclude-scala-xml | gjoranv | 2017-08-31 | 21 | -55/+123 |
| |\ | |||||
| * | | Exclude scala-xml from provided classpath | gjoranv | 2017-08-31 | 1 | -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. | gjoranv | 2017-08-31 | 2 | -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." | gjoranv | 2017-09-05 | 2 | -4/+5 |
| | | | | | | | | | | | | This reverts commit 121785959820d1f3803a160b589644685e9684e9. | ||||
* | | | Keep using the deprecated createClassName method for now. | gjoranv | 2017-09-05 | 2 | -5/+4 |
| | | | |||||
* | | | Rewrite ConfigGenerator.createClassName to Java. | gjoranv | 2017-09-05 | 2 | -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 Musum | 2017-08-31 | 3 | -6/+5 |
|\ \ \ | | |/ | |/| | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files | ||||
| * | | Update unit test with "libvespamallocd" | Jon Marius Venstad | 2017-08-30 | 1 | -3/+3 |
| | | | |||||
| * | | Since we are having so many issues with libyell we need to use an allocator ↵ | Henning Baldersheim | 2017-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | that has earlier detection of missuse. | ||||
| * | | Nonfunctional changes | Jon Bratseth | 2017-08-30 | 1 | -2/+1 |
| | | | |||||
* | | | Merge branch 'master' into ↵ | Harald Musum | 2017-08-30 | 6 | -5/+67 |
|\| | | | | | | | | | | | revert-3275-revert-3260-hmusum/remove-version-from-def-files | ||||
| * | | Read parallel tag from deployment.xml | Martin Polden | 2017-08-30 | 6 | -5/+67 |
| | | | |||||
* | | | Revert "Revert "version in def files are deprecated"" | Harald Musum | 2017-08-30 | 2 | -2/+0 |
| | | | |||||
* | | | Revert "version in def files are deprecated" | Harald Musum | 2017-08-30 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #3273 from vespa-engine/revert-3265-jvenstad/fix-unit-test | Harald Musum | 2017-08-30 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Revert "Update unit test with "libvespamallocd"" | ||||
| * | | | Revert "Update unit test with "libvespamallocd"" | Arnstein Ressem | 2017-08-30 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #3274 from ↵ | Harald Musum | 2017-08-30 | 1 | -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 Ressem | 2017-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | all…" | ||||
* | | | | Merge pull request #3260 from vespa-engine/hmusum/remove-version-from-def-files | gjoranv | 2017-08-30 | 2 | -2/+0 |
|\ \ \ \ | |/ / / |/| | | | version in def files are deprecated |