%!s(int64=15) %!d(string=hai) anos · 6d05cb6286
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 
				 .settings
			
 
				 .svn
			
 
				 build/
			
 
				+build-fi/
			
 
				 conf/masters
			
 
				 conf/slaves
			
 
				 conf/hadoop-env.sh
			
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -595,6 +595,8 @@ Trunk (unreleased changes)
 
				     HADOOP-6309. Change build.xml to run tests with java asserts.  (Eli
			
 
				     Collins via szetszwo)
			
 
				 
			
 
				+    HADOOP-6329. Add build-fi directory to the ignore lists.  (szetszwo)
			
 
				+
			
 
				   OPTIMIZATIONS
			
 
				 
			
 
				     HADOOP-5595. NameNode does not need to run a replicator to choose a