HADOOP-11194. Ignore .keep files (kasha)

(cherry picked from commit d5084b9fa3)
2014-10-20 11:29:09 -04:00 · 2014-10-20 11:29:09 -04:00 · f8e4cec08a
parent b4668f41e8
commit f8e4cec08a
2 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@
 *.iws
 *.orig
 *.rej
+**/.keep
 .idea
 .svn
 .classpath
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -317,6 +317,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)