From 9063f8dedd0ebcae4832bac7b9b5417b10bf7e09 Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Sat, 10 Jun 2017 12:07:43 +0200 Subject: [PATCH 1/2] web: fix double prefix --- web/web.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/web.go b/web/web.go index 61398f064..eba79c451 100644 --- a/web/web.go +++ b/web/web.go @@ -171,7 +171,7 @@ func New(o *Options) *Handler { instrf := prometheus.InstrumentHandlerFunc router.Get("/", func(w http.ResponseWriter, r *http.Request) { - router.Redirect(w, r, path.Join(o.ExternalURL.Path, "/graph"), http.StatusFound) + http.Redirect(w, r, path.Join(o.ExternalURL.Path, "/graph"), http.StatusFound) }) router.Get("/alerts", instrf("alerts", h.alerts)) From aef71047910f94dacbfa79ede0d5eb12a0cdf99e Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Mon, 12 Jun 2017 11:00:30 +0200 Subject: [PATCH 2/2] cut 1.7.1 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 567fc510d..0f7ad873f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.7.1 / 2017-06-12 + +* [BUGFIX] Fix double prefix redirect. + ## 1.7.0 / 2017-06-06 * [CHANGE] Compress remote storage requests and responses with unframed/raw snappy. diff --git a/VERSION b/VERSION index bd8bf882d..943f9cbc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.0 +1.7.1