Merge pull request #2001 from prometheus/beorn7/release

Cut v1.1.3

Merge pull request #2001 from prometheus/beorn7/release
Cut v1.1.3
ac374aa6 · Björn Rabenstein · GitHub · 3eef9596 · f4656acd · ac374aa6
隐藏空白更改
内联并排

Showing with 7 addition and 1 deletion

CHANGELOG.md CHANGELOG.md +6 -0

VERSION VERSION +1 -1

未找到文件。
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## 1.1.3 / 2016-09-16
+
+* [ENHANCEMENT] Use golang-builder base image for tests in CircleCI.
+* [ENHANCEMENT] Added unit tests for federation.
+* [BUGFIX] Correctly de-dup metric families in federation output.
+
 ## 1.1.2 / 2016-09-08

 * [BUGFIX] Allow label names that coincide with keywords.

--- a/VERSION
+++ b/VERSION
-1.1.2
+1.1.3