Commit graph

3 commits

Author SHA1 Message Date
Matei Zaharia 0e0ec83570 Undid some changes that Mosharaf inadvertedly committed to master. 2010-10-19 13:58:52 -07:00
Mosharaf Chowdhury bf7055decf Merge branch 'master' of git@github.com:mesos/spark
Conflicts:
	src/scala/spark/SparkContext.scala

Using the latest one from Matei.
2010-10-18 11:08:45 -07:00
Matei Zaharia e5fb280ec8 Changed the config files that were included in git to templates which
are used to create an initial copy of each config file if the user does
not have one. This way, users won't accidentally commit their changes to
config files to git.
2010-10-16 21:51:25 -07:00
Renamed from conf/spark-env.sh (Browse further)