big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595411 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Karthik Kambatla 2014-05-17 01:39:03 +00:00
parent f25c33b65f
commit 7bff84ad19
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -390,6 +390,8 @@ Release 2.5.0 - UNRELEASED
HADOOP-10572. Example NFS mount command must pass noacl as it isn't HADOOP-10572. Example NFS mount command must pass noacl as it isn't
supported by the server yet. (Harsh J via brandonli) supported by the server yet. (Harsh J via brandonli)
HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES