Merge pull request #1068 from prometheus/go1.5.1

Use go1.5.1

Makefile.INCLUDE

@@ -30,15 +30,9 @@ MAKEFILE_DIR ?= $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 
 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))))
 
-ifeq ($(GOOS),darwin)
-RELEASE_SUFFIX ?= -osx$(MAC_OS_X_VERSION)
-else
-RELEASE_SUFFIX ?=
-endif
-
 # Never honor GOBIN, should it be set at all.
 unexport GOBIN
 

retrieval/target.go

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