From bac9f25d184d8da67a496c9a11d596cc1a2640c7 Mon Sep 17 00:00:00 2001 From: Pete Shima Date: Tue, 22 Mar 2016 21:43:38 -0700 Subject: [PATCH] [Docs] Small update to retry join documentation --- website/source/docs/agent/config.html.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/source/docs/agent/config.html.md b/website/source/docs/agent/config.html.md index de8533f27..2590defe0 100644 --- a/website/source/docs/agent/config.html.md +++ b/website/source/docs/agent/config.html.md @@ -259,7 +259,8 @@ configured on client nodes. cluster. * `retry_join` Similar to [`start_join`](#start_join) but allows retrying a join if the first attempt fails. This is useful for cases where we know the - address will become available eventually. + address will become available eventually. Use `retry_join` with an array as a replacement for + `start_join`, do not use both options. * `retry_interval` The time to wait between join attempts. Defaults to 30s. * `retry_max` The maximum number of join attempts to be made before exiting with a return code of 1. By default, this is set to 0 which is interpreted @@ -269,7 +270,7 @@ configured on client nodes. specified addresses, agent startup will fail. By default, the agent won't join any nodes when it starts up. Addresses can be given as an IP, a domain name, or an IP:Port pair. If the port isn't specified the default Serf port, - 4648, is used. + 4648, is used. DNS names may also be used. ## Client-specific Options