diff options
| author | Kristian Aune <kkraune@users.noreply.github.com> | 2017-09-05 09:10:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 09:10:05 +0200 |
| commit | 129630e7822b10a8de23413133c8c2886360ca53 (patch) | |
| tree | fa05a6ede8204456b4ed331b8a1e11daa52adb43 | |
| parent | 1210f9daafc67c6c167afb04adf96d891cc88ebc (diff) | |
| parent | aa69d5835b2d752b47dc3e79e396f372188a52ab (diff) | |
Merge pull request #3326 from vespa-engine/bratseth/dont-install-jdisc-logfmt
Don't install jdisck logfmt variant
| -rw-r--r-- | install_java.cmake | 1 | ||||
| -rwxr-xr-x | jdisc_core/src/main/perl/vespa-jdisc-logfmt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/install_java.cmake b/install_java.cmake index 788ea42c2c2..91915be6acd 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -52,7 +52,6 @@ install_fat_java_artifact(vespaclient-java) install_fat_java_artifact(zkfacade) vespa_install_script(application-preprocessor/src/main/sh/vespa-preprocess-application bin) -vespa_install_script(jdisc_core/src/main/perl/vespa-jdisc-logfmt bin) vespa_install_script(config-proxy/src/main/sh/vespa-config-ctl bin) vespa_install_script(config-proxy/src/main/sh/vespa-config-loadtester bin) vespa_install_script(config-proxy/src/main/sh/vespa-config-verification bin) diff --git a/jdisc_core/src/main/perl/vespa-jdisc-logfmt b/jdisc_core/src/main/perl/vespa-jdisc-logfmt index c3fecad52a9..4d66dda027e 100755 --- a/jdisc_core/src/main/perl/vespa-jdisc-logfmt +++ b/jdisc_core/src/main/perl/vespa-jdisc-logfmt @@ -60,6 +60,8 @@ my $VESPA_HOME = $ENV{'VESPA_HOME'}; # END perl environment bootstrap section +# TODO: Remove on Vespa 7 + use 5.006_001; use strict; use warnings; |