From 32cc3139e3c2817595fc3dc1ad4f0587cf4afe2d Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Mon, 11 May 2015 11:35:02 -0700 Subject: [PATCH] HADOOP-11928. Test-patch check for @author tags incorrectly flags removal of @author tags (Kengo Seki via aw) --- dev-support/test-patch.sh | 2 +- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 788178b5766..a3ce5677c72 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -1495,7 +1495,7 @@ function check_author return 0 fi - authorTags=$("${GREP}" -c -i '@author' "${PATCH_DIR}/patch") + authorTags=$("${GREP}" -c -i '^[^-].*@author' "${PATCH_DIR}/patch") echo "There appear to be ${authorTags} @author tags in the patch." if [[ ${authorTags} != 0 ]] ; then add_jira_table -1 @author \ diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e850a554003..929ada12719 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -653,6 +653,9 @@ Release 2.8.0 - UNRELEASED HADOOP-9729. The example code of org.apache.hadoop.util.Tool is incorrect (hellojinjie via jlowe) + HADOOP-11928. Test-patch check for @author tags incorrectly flags + removal of @author tags (Kengo Seki via aw) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES