Merge branch 'master' into partitioners
This commit is contained in:
commit
639e27a396
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -14,6 +14,8 @@ conf/java-opts
|
|||
conf/spark-env.sh
|
||||
conf/streaming-env.sh
|
||||
conf/log4j.properties
|
||||
conf/slaves
|
||||
conf/core-site.xml
|
||||
docs/_site
|
||||
docs/api
|
||||
target/
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
# A Spark Worker will be started on each of the machines listed below.
|
||||
localhost
|
Loading…
Reference in a new issue