From d4295e69ba46ffac3e0b3b9a1c945940a6a1af76 Mon Sep 17 00:00:00 2001
From: Thomas Jackson <jacksontj.89@gmail.com>
Date: Mon, 27 Aug 2018 12:18:42 -0700
Subject: [PATCH] Update prometheus to pick up fix

Fix from https://github.com/prometheus/prometheus/pull/4546
---
 Gopkg.lock                                              | 4 ++--
 vendor/github.com/prometheus/prometheus/web/federate.go | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index a3eeb5921..22acc5bb5 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -510,7 +510,7 @@
     "web/api/v2",
     "web/ui"
   ]
-  revision = "3e594b7652fc5fa1265b75cd429995bf5949f363"
+  revision = "b40118231a4d4974b97ec3f45120f8266ca562d6"
   source = "github.com/jacksontj/prometheus"
 
 [[projects]]
@@ -857,6 +857,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "d9a759a37e1301cb3968d3700610da155eafd5698d7a757effaa43854d18f31e"
+  inputs-digest = "196407655ef116f38d4d6682ab1fba7291ff01292ba9b0a73e89b7963fc77fb9"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/vendor/github.com/prometheus/prometheus/web/federate.go b/vendor/github.com/prometheus/prometheus/web/federate.go
index e5a176517..6b12c6fa5 100644
--- a/vendor/github.com/prometheus/prometheus/web/federate.go
+++ b/vendor/github.com/prometheus/prometheus/web/federate.go
@@ -72,9 +72,14 @@ func (h *Handler) federation(w http.ResponseWriter, req *http.Request) {
 
 	vec := make(promql.Vector, 0, 8000)
 
+	params := &storage.SelectParams{
+		Start: mint,
+		End:   maxt,
+	}
+
 	var sets []storage.SeriesSet
 	for _, mset := range matcherSets {
-		s, err := q.Select(nil, mset...)
+		s, err := q.Select(params, mset...)
 		if err != nil {
 			federationErrors.Inc()
 			http.Error(w, err.Error(), http.StatusInternalServerError)