Merge branch 'release-1.1'

zhaosijun · Sep 7, 2016 · d48a1be · d48a1be
2 parents fec3b54 + 24db241
commit d48a1be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.1.1 / 2016-09-07
+
+* [BUGFIX] Fix IPv6 escaping in service discovery integrations
+* [BUGFIX] Fix default scrape port assignment for IPv6
+
 ## 1.1.0 / 2016-09-03
 
 * [FEATURE] Add `quantile` and `quantile_over_time`.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1