diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 3759e9fc3c0..d2f0244397f 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -2262,7 +2262,7 @@ function cleanup_and_exit # Jenkins or whatever already knows where it is at # since it told us to put it there! relative_patchdir >/dev/null - if [[ $? == 0 ]]; then + if [[ $? == 1 ]]; then hadoop_debug "mv ${PATCH_DIR} ${BASEDIR}" mv "${PATCH_DIR}" "${BASEDIR}" fi diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index feb68aec95a..9b73647f5e6 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -160,6 +160,8 @@ Release 2.8.0 - UNRELEASED HADOOP-11898. add nfs3 and portmap starting command in hadoop-daemon.sh in branch-2 (brandonli) + HADOOP-11926. test-patch.sh mv does wrong math (aw) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES