You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2014/10/20 17:29:21 UTC
git commit: HADOOP-11194. Ignore .keep files (kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk da80c4da4 -> d5084b9fa
HADOOP-11194. Ignore .keep files (kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d5084b9f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d5084b9f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d5084b9f
Branch: refs/heads/trunk
Commit: d5084b9fa30771bffb03f2bad69304141c6e4303
Parents: da80c4d
Author: Karthik Kambatla <ka...@apache.org>
Authored: Mon Oct 20 11:29:09 2014 -0400
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Mon Oct 20 11:29:09 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/d5084b9f/.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/d5084b9f/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 57215fb..a340636 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -662,6 +662,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)