diff options
| author | haitao.yao <yao.erix@gmail.com> | 2013-01-24 10:27:02 +0800 |
|---|---|---|
| committer | haitao.yao <yao.erix@gmail.com> | 2013-01-24 10:27:02 +0800 |
| commit | 97e242067b9d75abd88543c759d8fc0aebd9eb8c (patch) | |
| tree | 550ebeecf7d7edc0b2825561db0e5c835eb16512 /.gitignore | |
| parent | df9ae8a74e2d42f627a82f9b0a8123a4d54b1d09 (diff) | |
| parent | 548856a22403f6a76d67570db6fa448b2a0e5ad3 (diff) | |
| download | spark-97e242067b9d75abd88543c759d8fc0aebd9eb8c.tar.gz spark-97e242067b9d75abd88543c759d8fc0aebd9eb8c.tar.bz2 spark-97e242067b9d75abd88543c759d8fc0aebd9eb8c.zip | |
Merge branch 'mesos'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 672c60af3d..155e785b01 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ third_party/libmesos.so third_party/libmesos.dylib conf/java-opts conf/spark-env.sh +conf/streaming-env.sh conf/log4j.properties docs/_site docs/api @@ -31,6 +32,7 @@ project/plugins/src_managed/ logs/ log/ spark-tests.log +streaming-tests.log dependency-reduced-pom.xml .ensime .ensime_lucene |