From e93d625d44eb970c7b2e139576ee368a7424d6e7 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 3 Nov 2017 16:00:30 -0700 Subject: [PATCH 1/2] Remove noisy log line Didn't mean to commit this --- client/gc.go | 1 - 1 file changed, 1 deletion(-) diff --git a/client/gc.go b/client/gc.go index cdbf876e7..a350b7e9c 100644 --- a/client/gc.go +++ b/client/gc.go @@ -87,7 +87,6 @@ func NewAllocGarbageCollector(logger *log.Logger, statsCollector stats.NodeStats // Run the periodic garbage collector. func (a *AllocGarbageCollector) Run() { ticker := time.NewTicker(a.config.Interval) - a.logger.Printf("[DEBUG] client.gc: GC'ing ever %v", a.config.Interval) for { select { case <-a.triggerCh: From f84bd23e7a420b11f228b363d58979c4c848e15e Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 3 Nov 2017 16:01:01 -0700 Subject: [PATCH 2/2] Fix git commit build flag --- GNUmakefile | 2 +- version/version.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 51b5992d7..36bc65d6d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ THIS_OS := $(shell uname) GIT_COMMIT := $(shell git rev-parse HEAD) GIT_DIRTY := $(if $(shell git status --porcelain),+CHANGES) -GO_LDFLAGS := "-X main.GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)" +GO_LDFLAGS := "-X github.com/hashicorp/nomad/version.GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)" GO_TAGS = default: help diff --git a/version/version.go b/version/version.go index 6085bee0d..34cfe0fd2 100644 --- a/version/version.go +++ b/version/version.go @@ -6,7 +6,6 @@ import ( ) var ( - // The git commit that was compiled. This will be filled in by the compiler. GitCommit string GitDescribe string