You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2015/03/11 21:19:21 UTC

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

Repository: hadoop
Updated Branches:
  refs/heads/trunk 30c428a85 -> 344d7cb6d


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/344d7cb6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/344d7cb6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/344d7cb6

Branch: refs/heads/trunk
Commit: 344d7cb6dcd3b1752c82b62271799be9e4e10416
Parents: 30c428a
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed Mar 11 13:19:12 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Wed Mar 11 13:19:12 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/344d7cb6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 15c040c..a49ad4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 *.iml
 *.ipr
 *.iws

http://git-wip-us.apache.org/repos/asf/hadoop/blob/344d7cb6/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3e42aa8..5bca61f 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)