From 8b892eda6a489cdd80e02f8b1783e0986ca9e168 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 24 May 2018 08:07:46 +0900
Subject: [PATCH] v1.2.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 477ef49707..1a1b9b92f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # v1.2
 
+## Release v1.2.1 - 2018/05/23
+
+### Enhancements
+
+* Counter: Add wait API to client
+  https://github.com/fluent/fluentd/pull/1997
+
+### Bug fixes
+
+* in_tcp/in_udp: Fix source_hostname_key to set hostname correctly
+  https://github.com/fluent/fluentd/pull/1976
+* in_monitor_agent: Fix buffer_total_queued_size calculation
+  https://github.com/fluent/fluentd/pull/1990
+* out_file: Temporal fix for broken gzipped files with gzip and append
+  https://github.com/fluent/fluentd/pull/1995
+* test: Fix unstable backup test
+  https://github.com/fluent/fluentd/pull/1979
+* gemspec: Remove deprecated has_rdoc
+
 ## Release v1.2.0 - 2018/04/30
 
 ### New Features
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 5c45b0c678..9f29b50140 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
 end