Skip to content

Commit

Permalink
Merge pull request #3501 from hashicorp/b-build-log-fixes
Browse files Browse the repository at this point in the history
Fix git commit build flag and remove unneeded log line
  • Loading branch information
schmichael authored Nov 3, 2017
2 parents 651c06b + f84bd23 commit 6ab0e8f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion client/gc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
)

var (

// The git commit that was compiled. This will be filled in by the compiler.
GitCommit string
GitDescribe string
Expand Down

0 comments on commit 6ab0e8f

Please sign in to comment.