11 лет назад · 7bff84ad19
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 
															 *.iml
														
 
															 *.ipr
														
 
															 *.iws
														
 
															+*.orig
														
 
															+*.rej
														
 
															 .idea
														
 
															 .svn
														
 
															 .classpath
														
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -390,6 +390,8 @@ Release 2.5.0 - UNRELEASED
 
															     HADOOP-10572. Example NFS mount command must pass noacl as it isn't
														
 
															     supported by the server yet. (Harsh J via brandonli)
														
 
															+    HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha)
														
 
															+
														
 
															   OPTIMIZATIONS
														
 
															   BUG FIXES