From e3effa337593618cbd7f0f4ef071766df1ec69a0 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Fri, 19 Feb 2021 07:46:59 +0900
Subject: [PATCH] v1.12.1

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
---
 CHANGELOG.md          | 25 +++++++++++++++++++++++++
 lib/fluent/version.rb |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a848fab5c3..41d8718354 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # v1.12
 
+## Release v1.12.1 - 2021/02/18
+
+### Enhancement
+
+* out_http: Add `headers_from_placeholders` parameter
+  https://github.com/fluent/fluentd/pull/3241
+* fluent-plugin-config-format: Add `--table` option to use markdown table
+  https://github.com/fluent/fluentd/pull/3240
+* Add `--disable-shared-socket`/`disable_shared_socket` to disable ServerEngine's shared socket setup
+  https://github.com/fluent/fluentd/pull/3250
+
+### Bug fix
+
+* ca_generate: Fix creating TLS certification files which include broken extensions
+  https://github.com/fluent/fluentd/pull/3246
+* test: Drop TLS 1.1 tests
+  https://github.com/fluent/fluentd/pull/3256
+* Remove old gem constraints to support Ruby 3
+
+### Misc
+
+* Use GitHub Actions
+  https://github.com/fluent/fluentd/pull/3233
+  https://github.com/fluent/fluentd/pull/3255
+
 ## Release v1.12.0 - 2021/01/05
 
 ### New feature
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 4d272a3db5..70b6edf0da 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.12.0'
+  VERSION = '1.12.1'
 
 end