aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKousuke Saruta <sarutak@oss.nttdata.co.jp>2014-09-18 12:04:32 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-09-18 12:04:32 -0700
commit6cab838b9803e3294c07bbf731c47154ec57afc0 (patch)
tree01c9bcd03e0ad34f6c8611827abffa4d9b0591ba /.gitignore
parent3ad4176cf980591469997a8a612bf422c90f86fd (diff)
downloadspark-6cab838b9803e3294c07bbf731c47154ec57afc0.tar.gz
spark-6cab838b9803e3294c07bbf731c47154ec57afc0.tar.bz2
spark-6cab838b9803e3294c07bbf731c47154ec57afc0.zip
[SPARK-3566] [BUILD] .gitignore and .rat-excludes should consider Windows cmd file and Emacs' backup files
Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp> Closes #2426 from sarutak/emacs-metafiles-ignore and squashes the following commits: a306020 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into emacs-metafiles-ignore 6a0a5eb [Kousuke Saruta] Added cmd file entry to .rat-excludes and .gitignore 897da63 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into emacs-metafiles-ignore 8cade06 [Kousuke Saruta] Modified .gitignore to ignore emacs lock file and backup file
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a31bf7e009..1bcd016576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
*~
+*.#*
+*#*#
*.swp
*.ipr
*.iml
@@ -16,6 +18,7 @@ third_party/libmesos.so
third_party/libmesos.dylib
conf/java-opts
conf/*.sh
+conf/*.cmd
conf/*.properties
conf/*.conf
conf/*.xml