mirror of
https://github.com/status-im/consul.git
synced 2025-01-10 05:45:46 +00:00
ce75f486ed
Port some changes that were made to the backport branch but not in the original PR. Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com> Signed-off-by: Mark Anderson <manderson@hashicorp.com>