[2/2] git commit: Merge pull request #462 from mateiz/conf-file-fix

[pw...@apache.org]

Merge pull request #462 from mateiz/conf-file-fix

Remove Typesafe Config usage and conf files to fix nested property names

With Typesafe Config we had the subtle problem of no longer allowing
nested property names, which are used for a few of our properties:
http://apache-spark-developers-list.1001551.n3.nabble.com/Config-properties-broken-in-master-td208.html

This PR is for branch 0.9 but should be added into master too.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/34e911ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/34e911ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/34e911ce

Branch: refs/heads/branch-0.9
Commit: 34e911ce9a9f91f3259189861779032069257852
Parents: ff7201c c8f9273
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jan 18 16:17:34 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jan 18 16:17:34 2014 -0800

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/SparkConf.scala | 18 +++-----
 core/src/test/resources/spark.conf              |  8 ----
 .../scala/org/apache/spark/SparkConfSuite.scala | 47 ++++++++++++--------
 docs/configuration.md                           | 28 +-----------
 project/SparkBuild.scala                        |  1 -
 python/pyspark/conf.py                          | 10 ++---
 6 files changed, 41 insertions(+), 71 deletions(-)
----------------------------------------------------------------------