From 40e6d9c72064b29e196f4a9d96894d4eb299d1dc Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Mon, 11 Jun 2018 16:27:39 -0400 Subject: [PATCH] Fixup a weird merge problem --- agent/agent.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index 6d9f80252b..cacd085216 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -1848,11 +1848,6 @@ func (a *Agent) AddCheck(check *structs.HealthCheck, chkType *structs.CheckType, check.CheckID, checks.MinInterval)) chkType.Interval = checks.MinInterval } - if chkType.Script != "" { - a.logger.Printf("[WARN] agent: check %q has the 'script' field, which has been deprecated "+ - "and replaced with the 'args' field. See https://www.consul.io/docs/agent/checks.html", - check.CheckID) - } if a.dockerClient == nil { dc, err := checks.NewDockerClient(os.Getenv("DOCKER_HOST"), checks.BufSize) @@ -1890,11 +1885,6 @@ func (a *Agent) AddCheck(check *structs.HealthCheck, chkType *structs.CheckType, check.CheckID, checks.MinInterval) chkType.Interval = checks.MinInterval } - if chkType.Script != "" { - a.logger.Printf("[WARN] agent: check %q has the 'script' field, which has been deprecated "+ - "and replaced with the 'args' field. See https://www.consul.io/docs/agent/checks.html", - check.CheckID) - } monitor := &checks.CheckMonitor{ Notify: a.State,