From 7bff84ad197b35be18c61da015c119dad7730ad4 Mon Sep 17 00:00:00 2001
From: Karthik Kambatla <kasha@apache.org>
Date: Sat, 17 May 2014 01:39:03 +0000
Subject: [PATCH] HADOOP-10609. .gitignore should ignore .orig and .rej files.
 (kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595411 13f79535-47bb-0310-9956-ffa450edef68
---
 .gitignore                                      | 2 ++
 hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index ac8222ad8de..06fd1e9bb6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.iml
 *.ipr
 *.iws
+*.orig
+*.rej
 .idea
 .svn
 .classpath
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5461a34d379..3aeb45865d4 100644
--- 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