diff options
author | Liwei Lin <lwlin7@gmail.com> | 2016-04-02 17:55:46 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-04-02 17:55:46 -0700 |
commit | 03d130f9734be66e8aefc4ffaa207ee13e837629 (patch) | |
tree | f2d836f861f2f24d813c60023bb1efe6d5cfcb5b /python | |
parent | 4a6e78abd9d5edc4a5092738dff0006bbe202a89 (diff) | |
download | spark-03d130f9734be66e8aefc4ffaa207ee13e837629.tar.gz spark-03d130f9734be66e8aefc4ffaa207ee13e837629.tar.bz2 spark-03d130f9734be66e8aefc4ffaa207ee13e837629.zip |
[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 <lwlin7@gmail.com>
Closes #12129 from lw-lin/tachyon-cleanup.
Diffstat (limited to 'python')
-rw-r--r-- | python/pyspark/storagelevel.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |