From 2740d24ad3966c5894eb44a02fcb5a9cbe760da3 Mon Sep 17 00:00:00 2001
From: Karthik Kambatla <kasha@apache.org>
Date: Fri, 14 Nov 2014 15:35:50 -0800
Subject: [PATCH] HADOOP-11307. create-release script should run git clean
 first (kasha)

(cherry picked from commit 4fb96dbe3bbfd3ae88b41c816e15acee04518851)
---
 dev-support/create-release.sh                   | 6 ++++++
 hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/dev-support/create-release.sh b/dev-support/create-release.sh
index 447fbdd6cc6..7a3dd703347 100755
--- a/dev-support/create-release.sh
+++ b/dev-support/create-release.sh
@@ -47,6 +47,9 @@ RC_LABEL=$1
 # Extract Hadoop version from POM
 HADOOP_VERSION=`cat pom.xml | grep "<version>" | head -1 | sed 's|^ *<version>||' | sed 's|</version>.*$||'`
 
+# Setup git
+GIT=${GIT:-git}
+
 echo
 echo "*****************************************************************"
 echo
@@ -70,6 +73,9 @@ fi
 
 ARTIFACTS_DIR="target/artifacts"
 
+# git clean to clear any remnants from previous build
+run ${GIT} clean -xdf
+
 # mvn clean for sanity
 run ${MVN} clean
 
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 570e53a1d6e..c568fe1d260 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -685,6 +685,7 @@ Release 2.6.0 - 2014-11-18
     HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead
     of wrapping it as IOException. (Steve Loughran via jianhe)
 
+
 Release 2.5.2 - 2014-11-10
 
   INCOMPATIBLE CHANGES
@@ -701,6 +702,7 @@ Release 2.5.2 - 2014-11-10
 
     HADOOP-11260. Patch up Jetty to disable SSLv3. (Mike Yoder via kasha)
 
+    HADOOP-11307. create-release script should run git clean first (kasha)
 
 Release 2.5.1 - 2014-09-05