diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-18 00:11:50 +0200 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-18 00:11:50 +0200 |
commit | ec193c7d896ce7553f8678d8c484c5821ce6a62a (patch) | |
tree | 48ed0a2b049b844617c5b2573ad153438faa7797 /project/plugins.sbt | |
parent | e6d1277315801b90cca23c926cf1ceb97b65c87c (diff) | |
parent | 53add598f2fe09759a0df1e08f87f70503f808c5 (diff) | |
download | spark-ec193c7d896ce7553f8678d8c484c5821ce6a62a.tar.gz spark-ec193c7d896ce7553f8678d8c484c5821ce6a62a.tar.bz2 spark-ec193c7d896ce7553f8678d8c484c5821ce6a62a.zip |
Merge remote-tracking branch 'xiajunluan/xiajunluan'
Conflicts:
core/src/main/scala/spark/scheduler/cluster/TaskSetManager.scala
Diffstat (limited to 'project/plugins.sbt')
0 files changed, 0 insertions, 0 deletions