summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2020-11-05 22:31:53 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-11-05 22:31:53 +0000
commitf6ee38f5b61073b27b94f0fecb8258dc942f5ddd (patch)
tree7ee88e189e8f24742ae009269c1be481664e2016
parent9f205147b5461cc29486f2c1830e88913a8d098e (diff)
parent6561c69ab0a8b1ee80a9dfba42a463f677d6756c (diff)
downloadbuildstream-f6ee38f5b61073b27b94f0fecb8258dc942f5ddd.tar.gz
Merge branch 'tpollard/drop_plugin_comment' into 'master'
src/buildstream/element.py: __use_remote_execution() reword desc See merge request BuildStream/buildstream!2097
-rw-r--r--src/buildstream/element.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 7f80d08f6..ac16e3103 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -2721,8 +2721,8 @@ class Element(Plugin):
# __use_remote_execution():
#
- # Returns True if remote execution is configured and the element plugin
- # supports it.
+ # Returns True if remote execution is configured, defaults to user defined
+ # project-specific overrides, project config, or global user config.
#
def __use_remote_execution(self):
return bool(self.__remote_execution_specs)