spark - Mirror of Apache Spark

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'apache-github/master' into remove-binaries	Patrick Wendell	2014-01-03	1	-1/+1
\| \| \| \| \| \|	Conflicts: core/src/test/scala/org/apache/spark/DriverSuite.scala docs/python-programming-guide.md
*	Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into ↵	Prashant Sharma	2014-01-02	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spark-915-segregate-scripts Conflicts: bin/spark-shell core/pom.xml core/src/main/scala/org/apache/spark/SparkContext.scala core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala core/src/main/scala/org/apache/spark/ui/UIWorkloadGenerator.scala core/src/test/scala/org/apache/spark/DriverSuite.scala python/run-tests sbin/compute-classpath.sh sbin/spark-class sbin/stop-slaves.sh
*	refactor $FWD variable	Andrew xia	2013-09-29	1	-1/+1
\|
*	add scripts in bin	shane-huang	2013-09-23	1	-1/+1
\| \| \| \|	Signed-off-by: shane-huang <shengsheng.huang@intel.com>
*	moved user scripts to bin folder	shane-huang	2013-09-23	1	-0/+66
	Signed-off-by: shane-huang <shengsheng.huang@intel.com>