Merge pull request #125 from uronce-cc/branch-1.4-tachyon-0.6.4

Add configurations for Tachyon

Author: shivaram

Diff for: templates/root/spark/conf/spark-defaults.conf

@@ -1,3 +1,8 @@
 spark.executor.memory	{{default_spark_mem}}
 spark.executor.extraLibraryPath	/root/ephemeral-hdfs/lib/native/
 spark.executor.extraClassPath	/root/ephemeral-hdfs/conf
+
+# for spark version < 1.4.0
+spark.tachyonStore.url tachyon://{{active_master}}:19998
+# for spark version >= 1.4.0
+spark.externalBlockStore.url tachyon://{{active_master}}:19998

Diff for: templates/root/tachyon/conf/workers

@@ -0,0 +1 @@
+{{slave_list}}