HADOOP-11703. git should ignore .DS_Store files on Mac OS X (Abin Shahab via aw)

2015-03-11 13:19:12 -07:00 · 2015-03-11 13:19:12 -07:00 · 344d7cb6dc
parent 30c428a858
commit 344d7cb6dc
2 changed files with 4 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
+.DS_Store
 *.iml
 *.ipr
 *.iws
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -426,6 +426,9 @@ Trunk (Unreleased)
    HADOOP-11668. hadoop-daemons.sh bw compat broke with --slaves change
    (Vinayakumar B via aw)

+    HADOOP-11703. git should ignore .DS_Store files on Mac OS X (Abin Shahab
+    via aw)
+
  OPTIMIZATIONS

    HADOOP-7761. Improve the performance of raw comparisons. (todd)