diff options
author | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-03 12:12:04 +0530 |
---|---|---|
committer | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-03 12:12:04 +0530 |
commit | b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc (patch) | |
tree | 0987c307777ba5947b43aee59233df6f3568a783 /core/src/test/resources | |
parent | 08ec10de1767ca543047b79c40ab50a04ce5df2f (diff) | |
parent | 498a5f0a1c6e82a33c2ad8c48b68bbdb8da57a95 (diff) | |
download | spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.tar.gz spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.tar.bz2 spark-b4bb80002bbf0ac3642c78ae9e5c260b5da4a4cc.zip |
Merge branch 'master' into spark-1002-remove-jars
Diffstat (limited to 'core/src/test/resources')
-rw-r--r-- | core/src/test/resources/spark.conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/src/test/resources/spark.conf b/core/src/test/resources/spark.conf new file mode 100644 index 0000000000..aa4e751235 --- /dev/null +++ b/core/src/test/resources/spark.conf @@ -0,0 +1,8 @@ +# A simple spark.conf file used only in our unit tests + +spark.test.intTestProperty = 1 + +spark.test { + stringTestProperty = "hi" + listTestProperty = ["a", "b"] +} |