From 12c8bf9b188149f94e3bfc56ced181978a55e387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 23 May 2017 16:45:15 +0200 Subject: [PATCH 1/2] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7c73231579..0b6bdf1c86d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 4.4.0 (unreleased) +* **Elasticsearch**: Added filter aggregation label [#8420](https://github.com/grafana/grafana/pull/8420), thx [@tianzk](github.com/tianzk) + # 4.3.1 (2017-05-23) ## Bug fixes From 6541ffe045be7fafaebb604be560dbf7f88c3f39 Mon Sep 17 00:00:00 2001 From: Prasanna Gautam Date: Tue, 23 May 2017 23:38:13 -0700 Subject: [PATCH 2/2] minor change: more accurate variable name (#8449) --- pkg/tsdb/time_range_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/tsdb/time_range_test.go b/pkg/tsdb/time_range_test.go index 5412d0d05f3..5d89e3977b8 100644 --- a/pkg/tsdb/time_range_test.go +++ b/pkg/tsdb/time_range_test.go @@ -52,8 +52,8 @@ func TestTimeRange(t *testing.T) { }) Convey("now-10m ", func() { - fiveMinAgo, _ := time.ParseDuration("-10m") - expected := now.Add(fiveMinAgo) + tenMinAgo, _ := time.ParseDuration("-10m") + expected := now.Add(tenMinAgo) res, err := tr.ParseTo() So(err, ShouldBeNil) So(res.Unix(), ShouldEqual, expected.Unix())