diff options
| author | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:08 -0800 |
|---|---|---|
| committer | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:08 -0800 |
| commit | 91227566bc9d8aabaec3f2a37a09a17afa20989c (patch) | |
| tree | 80d19aac29217005b3f1cb08ca95fa08bbb9d946 /python/epydoc.conf | |
| parent | 7210257ba3038d5e22d4b60fe9c3113dc45c3dff (diff) | |
| parent | 04d83fc37f9eef89c20331c85291a0a169f75e6d (diff) | |
| download | spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.tar.gz spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.tar.bz2 spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.zip | |
Merge remote-tracking branch 'spark-upstream/master' into HEAD
Conflicts:
README.md
core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala
core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
pom.xml
project/SparkBuild.scala
repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
Diffstat (limited to 'python/epydoc.conf')
| -rw-r--r-- | python/epydoc.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/epydoc.conf b/python/epydoc.conf index 1d0d002d36..95a6af0974 100644 --- a/python/epydoc.conf +++ b/python/epydoc.conf @@ -32,6 +32,6 @@ target: docs/ private: no -exclude: pyspark.cloudpickle pyspark.worker pyspark.join pyspark.serializers +exclude: pyspark.cloudpickle pyspark.worker pyspark.join pyspark.java_gateway pyspark.examples pyspark.shell pyspark.test - pyspark.rddsampler pyspark.daemon + pyspark.rddsampler pyspark.daemon pyspark.mllib._common |