From 344d7cb6dcd3b1752c82b62271799be9e4e10416 Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Wed, 11 Mar 2015 13:19:12 -0700
Subject: [PATCH] HADOOP-11703. git should ignore .DS_Store files on Mac OS X
 (Abin Shahab via aw)

---
 .gitignore                                      | 1 +
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 15c040cc30..a49ad4b48c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 *.iml
 *.ipr
 *.iws
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3e42aa8aa4..5bca61f484 100644
--- 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)