10 years ago · cdf265de4f
--- 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
@@ -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)