Repository: hadoop Updated Branches: refs/heads/branch-2 7da263623 -> e6a171e7a
HADOOP-12035. shellcheck plugin displays a wrong version potentially (Kengo Seki via aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e6a171e7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e6a171e7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e6a171e7 Branch: refs/heads/branch-2 Commit: e6a171e7a2c881197f1aac15453f11f34ad84d28 Parents: 7da2636 Author: Allen Wittenauer <a...@apache.org> Authored: Thu May 28 09:11:08 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Thu May 28 09:11:52 2015 -0700 ---------------------------------------------------------------------- dev-support/test-patch.d/shellcheck.sh | 2 +- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6a171e7/dev-support/test-patch.d/shellcheck.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.d/shellcheck.sh b/dev-support/test-patch.d/shellcheck.sh index 5f38b6a..9277ea5 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6a171e7/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e8daa43..4876fab 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -297,6 +297,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