From f4656acd1feb8b34e1598b87f0da48f4143c6e29 Mon Sep 17 00:00:00 2001 From: beorn7 Date: Fri, 16 Sep 2016 13:08:16 +0200 Subject: [PATCH] Cut v1.1.3 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9efaae272a..a9853f1172 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 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. diff --git a/VERSION b/VERSION index 45a1b3f445..781dcb07cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.2 +1.1.3