HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595412 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-05-17 01:40:55 +00:00
parent 88335a843f
commit 9c5a2f812e
2 changed files with 4 additions and 0 deletions

2
.gitignore vendored
View File

@ -1,6 +1,8 @@
*.iml
*.ipr
*.iws
*.orig
*.rej
.idea
.svn
.classpath

View File

@ -53,6 +53,8 @@ Release 2.5.0 - UNRELEASED
HADOOP-10588. Workaround for jetty6 acceptor startup issue. (kihwal)
HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha)
OPTIMIZATIONS
BUG FIXES