From 7da2636232c4de623397b968cd83e2e2f83e1752 Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Thu, 28 May 2015 08:15:17 -0700
Subject: [PATCH] HADOOP-12004. test-patch breaks with reexec in certain
 situations (Sean Busbey via aw)

---
 dev-support/test-patch.sh                       | 2 +-
 hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index d5d6c26b629..5276023d17f 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -1509,7 +1509,7 @@ function check_reexec
 
   exec "${PATCH_DIR}/dev-support-test/test-patch.sh" \
     --reexec \
-    --branch "${PATCH_BRANCH}" \
+    --branch="${PATCH_BRANCH}" \
     --patch-dir="${PATCH_DIR}" \
       "${USER_PARAMS[@]}"
 }
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index b6c845957f7..e8daa43d17d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -150,6 +150,7 @@ Release 2.8.0 - UNRELEASED
     IPC server. (Masatake Iwasaki via aajisaka)
 
   BUG FIXES
+
     HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there
     is an I/O error during requestShortCircuitShm (cmccabe)
 
@@ -293,6 +294,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-8751. NPE in Token.toString() when Token is constructed using null
     identifier. (kanaka kumar avvaru via aajisaka)
 
+    HADOOP-12004. test-patch breaks with reexec in certain situations (Sean
+    Busbey via aw)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES