diff options
| author | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-10-18 11:08:45 -0700 |
|---|---|---|
| committer | Mosharaf Chowdhury <mosharaf@mosharaf-ubuntu.(none)> | 2010-10-18 11:08:45 -0700 |
| commit | bf7055decfefe29ab6123af8384a04effebcb9ab (patch) | |
| tree | d2fdf8799e105c9364045ddb2b6d776df75a19f7 /conf | |
| parent | ad7a9c5a3695f1f83cbdfa96d435003939582c8a (diff) | |
| parent | b940164db38ced59dcd26b91e41f20e5c1f56cc2 (diff) | |
| download | spark-bf7055decfefe29ab6123af8384a04effebcb9ab.tar.gz spark-bf7055decfefe29ab6123af8384a04effebcb9ab.tar.bz2 spark-bf7055decfefe29ab6123af8384a04effebcb9ab.zip | |
Merge branch 'master' of git@github.com:mesos/spark
Conflicts:
src/scala/spark/SparkContext.scala
Using the latest one from Matei.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/java-opts.template (renamed from conf/java-opts) | 0 | ||||
| -rw-r--r-- | conf/log4j.properties.template (renamed from conf/log4j.properties) | 0 | ||||
| -rwxr-xr-x | conf/spark-env.sh.template (renamed from conf/spark-env.sh) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/conf/java-opts b/conf/java-opts.template index b61e8163b5..b61e8163b5 100644 --- a/conf/java-opts +++ b/conf/java-opts.template diff --git a/conf/log4j.properties b/conf/log4j.properties.template index d72dbadc39..d72dbadc39 100644 --- a/conf/log4j.properties +++ b/conf/log4j.properties.template diff --git a/conf/spark-env.sh b/conf/spark-env.sh.template index 77f9cb69b9..77f9cb69b9 100755 --- a/conf/spark-env.sh +++ b/conf/spark-env.sh.template |