From 793c9aa3a45b5e6779b7fbf4fba8b0a1c930c8af Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Tue, 5 Jan 2021 11:42:36 +0900
Subject: [PATCH] v1.12.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 518b2bdbdd..aa2b280892 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+# v1.12
+
+## Release v1.12.0 - 2020/01/05
+
+### New feature
+
+* in_tail: Add `follow_inode` to support log rotation with wild card
+  https://github.com/fluent/fluentd/pull/2992
+* in_tail: Handle linux capability
+  https://github.com/fluent/fluentd/pull/3155
+  https://github.com/fluent/fluentd/pull/3162
+* windows: Add win32 events alternative to unix signals
+  https://github.com/fluent/fluentd/pull/3131
+
+### Enhancement
+
+* buffer: Enable metadata comparison optimization on all platform
+  https://github.com/fluent/fluentd/pull/3095
+* fluent-plugin-config-formatter: Handle `service_discovery` type
+  https://github.com/fluent/fluentd/pull/3178
+* in_http: Add `add_query_params` parameter to add query params to event record
+  https://github.com/fluent/fluentd/pull/3197
+* inject: Support `unixtime_micros` and `unixtime_nanos` in `time_type`
+  https://github.com/fluent/fluentd/pull/3220
+* Refactoring code
+  https://github.com/fluent/fluentd/pull/3167
+  https://github.com/fluent/fluentd/pull/3170
+  https://github.com/fluent/fluentd/pull/3180
+  https://github.com/fluent/fluentd/pull/3196
+  https://github.com/fluent/fluentd/pull/3213
+  https://github.com/fluent/fluentd/pull/3222
+
+### Bug fix
+
+* output: Prevent retry.step from being called too many times in a short time
+  https://github.com/fluent/fluentd/pull/3203
+
 # v1.11
 
 ## Release v1.11.5 - 2020/11/06
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 63cdd225b1..4d272a3db5 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.12.0.rc2'
+  VERSION = '1.12.0'
 
 end