diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 17:29:21 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 17:29:21 -0800 |
| commit | c0498f9265e32ba82bcf48bf0df0f29c6cfea587 (patch) | |
| tree | 55cce48bc1b7dcc4645715d06256c9923d6dd922 /python/epydoc.conf | |
| parent | f236ddd1a245a587d5ee331fb67cf41456ed383c (diff) | |
| parent | e4d6057b6692ca5f071819b4ec6eb5240a0a16bc (diff) | |
| download | spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.tar.gz spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.tar.bz2 spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.zip | |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
core/src/main/scala/org/apache/spark/deploy/client/TestClient.scala
core/src/main/scala/org/apache/spark/deploy/master/Master.scala
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
Diffstat (limited to 'python/epydoc.conf')
| -rw-r--r-- | python/epydoc.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/epydoc.conf b/python/epydoc.conf index 0b42e729f8..95a6af0974 100644 --- a/python/epydoc.conf +++ b/python/epydoc.conf @@ -34,4 +34,4 @@ private: no 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 |