Patrick Wendell 604fad9c39 Merge remote-tracking branch 'apache-github/master' into remove-binaries ... Conflicts: core/src/test/scala/org/apache/spark/DriverSuite.scala docs/python-programming-guide.md		2014-01-03 21:29:33 -08:00
..
examples	Add banner to PySpark and make wordcount output nicer	2013-09-01 14:13:16 -07:00
lib	Changes on top of Prashant's patch.	2014-01-03 18:30:17 -08:00
pyspark	Merge remote-tracking branch 'apache-github/master' into remove-binaries	2014-01-03 21:29:33 -08:00
test_support	License headers	2013-12-09 16:41:01 -08:00
.gitignore	Rename top-level 'pyspark' directory to 'python'	2013-01-01 15:05:00 -08:00
epydoc.conf	Fix some Python docs and make sure to unset SPARK_TESTING in Python	2013-12-29 20:15:07 -05:00
run-tests	Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into spark-915-segregate-scripts	2014-01-02 17:55:21 +05:30