HADOOP-11194. Ignore .keep files (kasha)

(cherry picked from commit d5084b9fa3)
This commit is contained in:
Karthik Kambatla 2014-10-20 11:29:09 -04:00
parent b4668f41e8
commit f8e4cec08a
2 changed files with 3 additions and 0 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.iws *.iws
*.orig *.orig
*.rej *.rej
**/.keep
.idea .idea
.svn .svn
.classpath .classpath

View File

@ -317,6 +317,8 @@ Release 2.6.0 - UNRELEASED
HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib
codecs. (Gopal Vijayaraghavan via acmurthy) codecs. (Gopal Vijayaraghavan via acmurthy)
HADOOP-11194. Ignore .keep files. (kasha)
BUG FIXES BUG FIXES
HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) HADOOP-11182. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)