Merge pull request prometheus#3952 from prometheus/cut221

*: cut 2.2.1
JoaoVM · Mar 14, 2018 · bc6058c · bc6058c
2 parents 0847a60 + f22e5dc
commit bc6058c
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.2.1 / 2018-03-13
+
+* [BUGFIX] Fix data loss in TSDB on compaction
+* [BUGFIX] Correctly stop timer in remote-write path
+* [BUGFIX] Fix deadlock triggerd by loading targets page
+* [BUGFIX] Fix incorrect buffering of samples on range selection queries
+* [BUGFIX] Handle large index files on windows properly
+
 ## 2.2.0 / 2018-03-08
 
 * [CHANGE] Rename file SD mtime metric.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/vendor/github.com/prometheus/tsdb/fileutil/mmap_386.go b/vendor/github.com/prometheus/tsdb/fileutil/mmap_386.go
diff --git a/vendor/github.com/prometheus/tsdb/fileutil/mmap_amd64.go b/vendor/github.com/prometheus/tsdb/fileutil/mmap_amd64.go
diff --git a/vendor/github.com/prometheus/tsdb/fileutil/mmap_windows.go b/vendor/github.com/prometheus/tsdb/fileutil/mmap_windows.go
diff --git a/vendor/github.com/prometheus/tsdb/repair.go b/vendor/github.com/prometheus/tsdb/repair.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -800,40 +800,40 @@
 			"revisionTime": "2016-04-11T19:08:41Z"
 		},
 		{
-			"checksumSHA1": "JfxP001vgt0P+hEDk/if0bxa8xU=",
+			"checksumSHA1": "vNslgGjRBqauFmVIBTkvEWwvURg=",
 			"path": "github.com/prometheus/tsdb",
-			"revision": "00404ae5ab578bb550377a17aab5511deb0592c5",
-			"revisionTime": "2018-03-13T20:20:03Z"
+			"revision": "659ed644294eec6310cef0685b002a3aed8c8f85",
+			"revisionTime": "2018-03-14T13:49:50Z"
 		},
 		{
 			"checksumSHA1": "S7F4yWxVLhxQNHMdgoOo6plmOOs=",
 			"path": "github.com/prometheus/tsdb/chunkenc",
-			"revision": "00404ae5ab578bb550377a17aab5511deb0592c5",
-			"revisionTime": "2018-03-13T20:20:03Z"
+			"revision": "659ed644294eec6310cef0685b002a3aed8c8f85",
+			"revisionTime": "2018-03-14T13:49:50Z"
 		},
 		{
 			"checksumSHA1": "+zsn1i8cqwgZXL8Bg6jDy32xjAo=",
 			"path": "github.com/prometheus/tsdb/chunks",
-			"revision": "00404ae5ab578bb550377a17aab5511deb0592c5",
-			"revisionTime": "2018-03-13T20:20:03Z"
+			"revision": "659ed644294eec6310cef0685b002a3aed8c8f85",
+			"revisionTime": "2018-03-14T13:49:50Z"
 		},
 		{
-			"checksumSHA1": "h49AAcJ5+iRBwCgbfQf+2T1E1ZE=",
+			"checksumSHA1": "T7qvg4VhFLklT3g+qPkUWxBo0yw=",
 			"path": "github.com/prometheus/tsdb/fileutil",
-			"revision": "00404ae5ab578bb550377a17aab5511deb0592c5",
-			"revisionTime": "2018-03-13T20:20:03Z"
+			"revision": "659ed644294eec6310cef0685b002a3aed8c8f85",
+			"revisionTime": "2018-03-14T13:49:50Z"
 		},
 		{
 			"checksumSHA1": "4ebzIE2Jvj6+SG6yGFSXN8scgfo=",
 			"path": "github.com/prometheus/tsdb/index",
-			"revision": "00404ae5ab578bb550377a17aab5511deb0592c5",
-			"revisionTime": "2018-03-13T20:20:03Z"
+			"revision": "659ed644294eec6310cef0685b002a3aed8c8f85",
+			"revisionTime": "2018-03-14T13:49:50Z"
 		},
 		{
 			"checksumSHA1": "Va8HWvOFTwFeewZFadMAOzNGDps=",
 			"path": "github.com/prometheus/tsdb/labels",
-			"revision": "00404ae5ab578bb550377a17aab5511deb0592c5",
-			"revisionTime": "2018-03-13T20:20:03Z"
+			"revision": "659ed644294eec6310cef0685b002a3aed8c8f85",
+			"revisionTime": "2018-03-14T13:49:50Z"
 		},
 		{
 			"checksumSHA1": "5SYLEhADhdBVZAGPVHWggQl7H8k=",