diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-18 14:55:31 +0200 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-18 14:55:31 +0200 |
commit | dbfab49d2a1380fa598f43de8e02c9e0eb467e17 (patch) | |
tree | 602b2d35c32a71a8656485d26526a7cb4881930a /project/plugins.sbt | |
parent | 73f4c7d2d188e61b361ce772d9525767b7c48680 (diff) | |
parent | b5b12823faf62766d880e497c90b44b21f5a433a (diff) | |
download | spark-dbfab49d2a1380fa598f43de8e02c9e0eb467e17.tar.gz spark-dbfab49d2a1380fa598f43de8e02c9e0eb467e17.tar.bz2 spark-dbfab49d2a1380fa598f43de8e02c9e0eb467e17.zip |
Merge remote-tracking branch 'milliondreams/casdemo'
Conflicts:
project/SparkBuild.scala
Diffstat (limited to 'project/plugins.sbt')
0 files changed, 0 insertions, 0 deletions