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
2014-05-17 01:39:03 +00:00 · 2014-05-17 01:39:03 +00:00 · 7bff84ad19
parent f25c33b65f
commit 7bff84ad19
2 changed files with 4 additions and 0 deletions
--- 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