From cdf265de4f0afe8eb3e9bcd8ec8b14023f3c68b4 Mon Sep 17 00:00:00 2001
From: Karthik Kambatla <kasha@apache.org>
Date: Mon, 20 Oct 2014 11:29:09 -0400
Subject: [PATCH] HADOOP-11194. Ignore .keep files (kasha)

(cherry picked from commit d5084b9fa30771bffb03f2bad69304141c6e4303)
---
 .gitignore                                      | 1 +
 hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6ece6ca6696..9d812531726 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.iws
 *.orig
 *.rej
+**/.keep
 .idea
 .svn
 .classpath
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 12ae681a658..073757250dd 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -297,6 +297,8 @@ Release 2.6.0 - UNRELEASED
     HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib
     codecs. (Gopal Vijayaraghavan via acmurthy)
 
+    HADOOP-11194. Ignore .keep files. (kasha)
+
   BUG FIXES
 
     HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)