Merge pull request #1263 from prometheus/015rc0

Cut 0.15.0-rc.0
prometheus · Feb 28, 2018 · 68122e7 · 68122e7
2 parents c39a913 + 56ff382
commit 68122e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ services:
 - docker
 
 go:
-- 1.x
+- 1.10.x
 
 script:
 # test front-end

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.15.0-rc.0 / 2018-02-28
+
+* [CHANGE] Moved to memberlist as underlying gossip protocol
+* [FEATURE] Make HTTP clients used for integrations configurable
+* [ENHANCEMENT] Support receiving alerts with end time and zero start time
+* [BUGFIX] Properly configure HTTP client for Wechat integration
+
 ## 0.14.0 / 2018-02-12
 
 * [ENHANCEMENT] [amtool] Silence update support dwy suffixes to expire flag (#1197)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.14.0
+0.15.0-rc.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ services: @@
     - docker
     go:
-    - 1.x
+    - 1.10.x
     script:
     # test front-end
@@ Expand Down @@