Merge pull request prometheus#2218 from prometheus/cut-1.4.0

*: cut 1.4.0
ikaros · Nov 25, 2016 · ecad074 · ecad074
2 parents 9b7f5c7 + 8045595
commit ecad074
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: go
 
 go:
-- 1.6.3
+- 1.7.3
 
 go_import_path: github.com/prometheus/prometheus
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.4.0 / 2016-11-25
+
+* [FEATURE] Allow configuring Alertmanagers via service discovery
+* [FEATURE] Display used Alertmanagers on runtime page in the UI
+* [FEATURE] Support profiles in AWS EC2 service discovery configuration
+* [ENHANCEMENT] Remove duplicated logging of Kubernetes client errors
+* [ENHANCEMENT] Add metrics about Kubernetes service discovery
+* [BUGFIX] Update alert annotations on re-evaluation
+* [BUGFIX] Fix export of group modifier in PromQL queries
+* [BUGFIX] Remove potential deadlocks in several service discovery implementations
+* [BUGFIX] Use proper float64 modulo in PromQL `%` binary operations
+* [BUGFIX] Fix crash bug in Kubernetes service discovery
+
 ## 1.3.1 / 2016-11-04
 
 This bug-fix release pulls in the fixes from the 1.2.3 release.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.1
+1.4.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ sudo: false @@
     language: go
     go:
-    - 1.6.3
+    - 1.7.3
     go_import_path: github.com/prometheus/prometheus
@@ Expand Down @@