Merge pull request prometheus#5914 from prometheus/release-2.12

Merge release 2.12 back into master
openai · Aug 19, 2019 · d7f4183 · d7f4183
2 parents 099b0d7 + 43acd0e
commit d7f4183
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.12.0-rc.0 / 2019-08-14
+## 2.12.0 / 2019-08-17
 
 * [FEATURE] Track currently active PromQL queries in a log file. #5794
 * [FEATURE] Enable and provide binaries for `mips64` / `mips64le` architectures. #5792

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.12.0-rc.0
+2.12.0