Merge back release-2.36 (#10850)

* Fix UI build (#10842) Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu> * Add --lint-fatal option (#10815) (#10840) This keeps the previous behaviour of printing details about duplicate rules but doesn't exit with a fatal exit code unless turned on. Signed-off-by: David Leadbeater <dgl@dgl.cx> Co-authored-by: David Leadbeater <dgl@dgl.cx> * Add v2.36.1 CHANGELOG and VERSION update Signed-off-by: Matthias Loibl <mail@matthiasloibl.com> Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: David Leadbeater <dgl@dgl.cx>
prometheus · Jun 9, 2022 · a84c472 · a84c472
2 parents f2ba2a0 + 3c0a100
commit a84c472
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.36.1 / 2022-06-09
+
+* [BUGFIX] promtool: Add --lint-fatal option #10840
+
 ## 2.36.0 / 2022-05-30
 
 * [FEATURE] Add lowercase and uppercase relabel action. #10641

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.36.0
+2.36.1