diff options
author | wangfei <wangfei1@huawei.com> | 2014-09-16 21:57:33 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-09-16 21:57:33 -0700 |
commit | 008a5ed4808d1467b47c1d6fa4d950cc6c4976b7 (patch) | |
tree | b620779560e83bf792f2363f81614a2f9642e5db | |
parent | 0a7091e689a4c8b1e7b61e9f0873e6557f40d952 (diff) | |
download | spark-008a5ed4808d1467b47c1d6fa4d950cc6c4976b7.tar.gz spark-008a5ed4808d1467b47c1d6fa4d950cc6c4976b7.tar.bz2 spark-008a5ed4808d1467b47c1d6fa4d950cc6c4976b7.zip |
[Minor]ignore all config files in conf
Some config files in ```conf``` should ignore, such as
conf/fairscheduler.xml
conf/hive-log4j.properties
conf/metrics.properties
...
So ignore all ```sh```/```properties```/```conf```/```xml``` files
Author: wangfei <wangfei1@huawei.com>
Closes #2395 from scwf/patch-2 and squashes the following commits:
3dc53f2 [wangfei] duplicate ```conf/*.conf```
3c2986f [wangfei] ignore all config files
-rw-r--r-- | .gitignore | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 7ec8d45e12..a31bf7e009 100644 --- a/.gitignore +++ b/.gitignore @@ -15,11 +15,10 @@ out/ third_party/libmesos.so third_party/libmesos.dylib conf/java-opts -conf/spark-env.sh -conf/streaming-env.sh -conf/log4j.properties -conf/spark-defaults.conf -conf/hive-site.xml +conf/*.sh +conf/*.properties +conf/*.conf +conf/*.xml docs/_site docs/api target/ @@ -50,7 +49,6 @@ unit-tests.log /lib/ rat-results.txt scalastyle.txt -conf/*.conf scalastyle-output.xml # For Hive |