From 03d130f9734be66e8aefc4ffaa207ee13e837629 Mon Sep 17 00:00:00 2001 From: Liwei Lin Date: Sat, 2 Apr 2016 17:55:46 -0700 Subject: [SPARK-14342][CORE][DOCS][TESTS] Remove straggler references to Tachyon ## What changes were proposed in this pull request? Straggler references to Tachyon were removed: - for docs, `tachyon` has been generalized as `off-heap memory`; - for Mesos test suits, the key-value `tachyon:true`/`tachyon:false` has been changed to `os:centos`/`os:ubuntu`, since `os` is an example constrain used by the [Mesos official docs](http://mesos.apache.org/documentation/attributes-resources/). ## How was this patch tested? Existing test suites. Author: Liwei Lin Closes #12129 from lw-lin/tachyon-cleanup. --- python/pyspark/storagelevel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python') diff --git a/python/pyspark/storagelevel.py b/python/pyspark/storagelevel.py index d4f184a85d..176e3bb41c 100644 --- a/python/pyspark/storagelevel.py +++ b/python/pyspark/storagelevel.py @@ -44,7 +44,7 @@ class StorageLevel(object): result = "" result += "Disk " if self.useDisk else "" result += "Memory " if self.useMemory else "" - result += "Tachyon " if self.useOffHeap else "" + result += "OffHeap " if self.useOffHeap else "" result += "Deserialized " if self.deserialized else "Serialized " result += "%sx Replicated" % self.replication return result -- cgit v1.2.3