summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2020-01-27 08:20:01 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2020-01-27 08:20:01 +0100
commit927e4908e26149279ab5e3788c11245300523adc (patch)
tree9b1d940a07291b3adae2c83038fefe486a56d858
parent0eff7a427ffdedb9df807003515c30f2c5f980ef (diff)
parent3e8d5e7bbb002c67f98ead349a4c5cd00110c9a6 (diff)
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: Bazel: Remove deprecated tls_enabled option Change-Id: Ibdd5ff445bf26b6dcd319e37b08a649fd857f7f3
-rw-r--r--tools/remote-bazelrc3
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/remote-bazelrc b/tools/remote-bazelrc
index b26a8e8f6d..826be1d5fc 100644
--- a/tools/remote-bazelrc
+++ b/tools/remote-bazelrc
@@ -70,9 +70,6 @@ build:remote --remote_cache=remotebuildexecution.googleapis.com
# Enable remote execution so actions are performed on the remote systems.
build:remote --remote_executor=remotebuildexecution.googleapis.com
-# Enable encryption.
-build:remote --tls_enabled=true
-
# Set a higher timeout value, just in case.
build:remote --remote_timeout=3600