From 4faf3d08eea3c95bdcbb79dbf60af3453917317c Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Fri, 8 Sep 2017 06:40:15 +0900
Subject: [PATCH] v0.14.21

---
 ChangeLog             | 20 ++++++++++++++++++++
 lib/fluent/version.rb |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cbb1645a92..e8bbeddc87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 # v0.14
 
+## Release v0.14.21 - 2017/09/07
+
+### New features / Enhancements
+
+* filter_parser: Support record_accessor in key_name
+  https://github.com/fluent/fluentd/pull/1654
+* buffer: Support record_accessor in chunk keys
+  https://github.com/fluent/fluentd/pull/1662
+
+### Bug fixes
+
+* compat_parameters: Support all syslog parser parameters
+  https://github.com/fluent/fluentd/pull/1650
+* filter_record_transformer: Don't create new keys if the original record doesn't have `keep_keys` keys
+  https://github.com/fluent/fluentd/pull/1663
+* in_tail: Fix the error when 'tag *' is configured
+  https://github.com/fluent/fluentd/pull/1664
+* supervisor: Clear previous worker pids when receive kill signals.
+  https://github.com/fluent/fluentd/pull/1683
+
 ## Release v0.14.20 - 2017/07/31
 
 ### New features / Enhancements
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 44c7320502..39588e4620 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.20'
+  VERSION = '0.14.21'
 
 end