Merge pull request #738 from mxinden/cut-v1.6.0

*: Cut v1.6.0
kubernetes · May 6, 2019 · de19ed4 · de19ed4
2 parents 537ebd6 + 7532d62
commit de19ed4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,7 @@
-## v1.6.0-rc.2 / 2019-04-26
+## v1.6.0 / 2019-05-06
 
-* [BUGFIX] Bump addon-resizer patch version reducing resource consumption (#724).
-
-## v1.6.0-rc.1 / 2019-04-23
-
-* [BUGFIX] Use k8s.io/api/apps/v1 for DaemonSet, Deployment and StatefulSet reflector (#720).
-
-## v1.6.0-rc.0 / 2019-04-05
+After a testing period of 10 days (release candidate 2), there were no
+additional bugs found, thus releasing the stable version v1.6.0.
 
 * [FEATURE] Add `kube_replicaset_labels` to replicaset collector (#638).
 * [FEATURE] Add ingresses collector (#640).
@@ -15,6 +10,8 @@
 * [FEATURE] Add `kube_persistentvolume_capacity` metric (#674).
 * [FEATURE] Add `kube_job_owner` metric (#681).
 * [ENHANCEMENT] Add `priority_class` label to `kube_pod_info` metric (#713).
+* [BUGFIX] Bump addon-resizer patch version reducing resource consumption (#724).
+* [BUGFIX] Use k8s.io/api/apps/v1 for DaemonSet, Deployment and StatefulSet reflector (#720).
 
 ## v1.5.0 / 2019-01-10
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.0-rc.2
+1.6.0