Repository: hadoop Updated Branches: refs/heads/branch-2 b4668f41e -> f8e4cec08
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/f8e4cec0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f8e4cec0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f8e4cec0 Branch: refs/heads/branch-2 Commit: f8e4cec08a443126d48f3e2dba7e0afa1cbd7187 Parents: b4668f4 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:49 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/f8e4cec0/.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/f8e4cec0/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 a84e55f..a97a6b9 100644 --- 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)
