From ea60ea3b85fa0e1da0dbd88869997cd44bc9841a Mon Sep 17 00:00:00 2001
From: Jason Darrell Lowe <jlowe@apache.org>
Date: Tue, 28 May 2013 20:58:39 +0000
Subject: [PATCH] svn merge -c 1456212 FIXES: HADOOP-9397. Incremental dist tar
 build fails. Contributed by Chris Nauroth

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487117 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
 hadoop-dist/pom.xml                             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index da72315ca18..b783eaef756 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -367,6 +367,8 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9553. TestAuthenticationToken fails on Windows.
     (Arpit Agarwal via suresh)
 
+    HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index c0847beef5f..06f1d6b05c8 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -152,7 +152,7 @@
                       }
 
                       run tar cf hadoop-${project.version}.tar hadoop-${project.version}
-                      run gzip hadoop-${project.version}.tar
+                      run gzip -f hadoop-${project.version}.tar
                       echo
                       echo "Hadoop dist tar available at: ${project.build.directory}/hadoop-${project.version}.tar.gz"
                       echo