hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject git commit: HADOOP-11194. Ignore .keep files (kasha)
Date Mon, 20 Oct 2014 15:33:20 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 a78dd99d6 -> cdf265de4


HADOOP-11194. Ignore .keep files (kasha)

(cherry picked from commit d5084b9fa30771bffb03f2bad69304141c6e4303)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cdf265de
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cdf265de
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cdf265de

Branch: refs/heads/branch-2.6
Commit: cdf265de4f0afe8eb3e9bcd8ec8b14023f3c68b4
Parents: a78dd99
Author: Karthik Kambatla <kasha@apache.org>
Authored: Mon Oct 20 11:29:09 2014 -0400
Committer: Karthik Kambatla <kasha@apache.org>
Committed: Mon Oct 20 11:30:13 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdf265de/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6ece6ca..9d81253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.iws
 *.orig
 *.rej
+**/.keep
 .idea
 .svn
 .classpath

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cdf265de/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 12ae681..0737572 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)


Mime
View raw message