From f1cea9c6bf68f03f7136bebc245efbc0a95738e4 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Thu, 28 May 2015 09:11:08 -0700 Subject: [PATCH] HADOOP-12035. shellcheck plugin displays a wrong version potentially (Kengo Seki via aw) --- dev-support/test-patch.d/shellcheck.sh | 2 +- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-support/test-patch.d/shellcheck.sh b/dev-support/test-patch.d/shellcheck.sh index 5f38b6a2582..9277ea50aa4 100755 --- a/dev-support/test-patch.d/shellcheck.sh +++ b/dev-support/test-patch.d/shellcheck.sh @@ -72,7 +72,7 @@ function shellcheck_preapply start_clock # shellcheck disable=SC2016 - SHELLCHECK_VERSION=$(shellcheck --version | ${GREP} version: | ${AWK} '{print $NF}') + SHELLCHECK_VERSION=$(${SHELLCHECK} --version | ${GREP} version: | ${AWK} '{print $NF}') echo "Running shellcheck against all identifiable shell scripts" pushd "${BASEDIR}" >/dev/null diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 48e9f7db551..1009d1a62ba 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -765,6 +765,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12004. test-patch breaks with reexec in certain situations (Sean Busbey via aw) + HADOOP-12035. shellcheck plugin displays a wrong version potentially + (Kengo Seki via aw) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES