Reynold Xin 90577ada69 Merge branch 'shuffle-performance-fix-0.7' of github.com:shane-huang/spark into shufflemerge ... Conflicts: core/src/main/scala/spark/storage/BlockManager.scala core/src/main/scala/spark/storage/DiskStore.scala project/SparkBuild.scala		2013-05-07 15:56:19 -07:00
..
lib/org/apache/kafka/kafka	Add Maven build file for streaming, and fix some issues in SBT file	2013-01-20 19:22:24 -08:00
src	Merge branch 'shuffle-performance-fix-0.7' of github.com:shane-huang/spark into shufflemerge	2013-05-07 15:56:19 -07:00
pom.xml	Attempt at fixing merge conflict	2013-04-24 09:24:17 +05:30