diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-18 16:17:34 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-18 16:20:00 -0800 |
| commit | bf5699543bf69fc850dbc2676caac97fa27818da (patch) | |
| tree | 6a67ad6a1977c164b0f22d4206bb2248e073df18 /core/src/test/resources | |
| parent | aa981e4e97a11dbd5a4d012bfbdb395982968372 (diff) | |
| download | spark-bf5699543bf69fc850dbc2676caac97fa27818da.tar.gz spark-bf5699543bf69fc850dbc2676caac97fa27818da.tar.bz2 spark-bf5699543bf69fc850dbc2676caac97fa27818da.zip | |
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.
(cherry picked from commit 34e911ce9a9f91f3259189861779032069257852)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'core/src/test/resources')
| -rw-r--r-- | core/src/test/resources/spark.conf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/src/test/resources/spark.conf b/core/src/test/resources/spark.conf deleted file mode 100644 index aa4e751235..0000000000 --- a/core/src/test/resources/spark.conf +++ /dev/null @@ -1,8 +0,0 @@ -# A simple spark.conf file used only in our unit tests - -spark.test.intTestProperty = 1 - -spark.test { - stringTestProperty = "hi" - listTestProperty = ["a", "b"] -} |