mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1068 from prometheus/go1.5.1

Browse source 
Use go1.5.1
This commit is contained in:
Fabian Reinartz 2015-09-10 12:19:33 +02:00
parent 6e393807c3 8456b7e12f
commit 66f376f75a
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.INCLUDE
View file

@ -30,15 +30,9 @@ MAKEFILE_DIR ?= $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
BUILD_PATH = $(MAKEFILE_DIR)/.build BUILD_PATH = $(MAKEFILE_DIR)/.build
GO_VERSION := 1.4.2 GO_VERSION := 1.5.1
GOOS ?= $(subst Darwin,darwin,$(subst Linux,linux,$(subst FreeBSD,freebsd,$(OS)))) GOOS ?= $(subst Darwin,darwin,$(subst Linux,linux,$(subst FreeBSD,freebsd,$(OS))))
ifeq ($(GOOS),darwin)
RELEASE_SUFFIX ?= -osx$(MAC_OS_X_VERSION)
else
RELEASE_SUFFIX ?=
endif
# Never honor GOBIN, should it be set at all. # Never honor GOBIN, should it be set at all.
unexport GOBIN unexport GOBIN

2
retrieval/target.go
View file

@ -429,7 +429,7 @@ func (t *Target) scrape(appender storage.SampleAppender) (err error) {
req, err := http.NewRequest("GET", t.URL().String(), nil) req, err := http.NewRequest("GET", t.URL().String(), nil)
if err != nil { if err != nil {
panic(err) return err
} }
req.Header.Add("Accept", acceptHeader) req.Header.Add("Accept", acceptHeader)