16 years ago · 446309b039
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ conf/hadoop-policy.xml
 
				 conf/capacity-scheduler.xml
			
 
				 conf/mapred-queue-acls.xml
			
 
				 docs/api/
			
 
				+ivy/ivy-2.0.0-rc2.jar
			
 
				 logs/
			
 
				 src/contrib/ec2/bin/hadoop-ec2-env.sh
			
 
				 src/docs/build
			
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -565,6 +565,8 @@ Trunk (unreleased changes)
 
				     HADOOP-6217. Update documentation for project split. (Corinne Chandel via 
			
 
				     omalley)
			
 
				 
			
 
				+    HADOOP-6268. Add ivy jar to .gitignore. (Todd Lipcon via cdouglas)
			
 
				+
			
 
				   OPTIMIZATIONS
			
 
				 
			
 
				     HADOOP-5595. NameNode does not need to run a replicator to choose a