Merge branch 'main' into flynn/edge-release-updates

* main: Documenation fix: Remove statement about non exiting default timeout for service profiles. (#1733) Signed-off-by: Flynn <[email protected]>
linkerd · May 8, 2024 · 0596f8a · 0596f8a
2 parents d19e3e8 + eb40950
commit 0596f8a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/linkerd.io/content/2.14/tasks/configuring-timeouts.md b/linkerd.io/content/2.14/tasks/configuring-timeouts.md
@@ -77,8 +77,7 @@ spec:
 Each [route](../../reference/service-profiles/#route) in a [ServiceProfile] may
 define a request timeout for requests matching that route. This timeout secifies
 the maximum amount of time to wait for a response (including retries) to
-complete after the request is sent. If unspecified, the default timeout is 10
-seconds.
+complete after the request is sent.
 
 ```yaml
 spec: