From 67928490b8155b57d5459007ce2fb0d115007eee Mon Sep 17 00:00:00 2001
From: TAGOMORI Satoshi <tagomoris@gmail.com>
Date: Fri, 7 Oct 2016 16:16:57 +0900
Subject: [PATCH] v0.14.7

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

diff --git a/ChangeLog b/ChangeLog
index 57c85a5438..e9ceb92893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,51 @@
 # v0.14
 
+## Release v0.14.7 - 2016/10/07
+
+### New features / Enhancement
+
+* in_forward: support to transfer compressed data
+  https://github.com/fluent/fluentd/pull/1179
+* out_stdout: fix to show nanosecond resolution time
+  https://github.com/fluent/fluentd/pull/1249
+* Add option to rotate Fluentd daemon's log
+  https://github.com/fluent/fluentd/pull/1235
+* Add a feature to parse/format numeric time (unix time [+ subsecond value])
+  https://github.com/fluent/fluentd/pull/1254
+* Raise configuration errors for inconsistent <label> configurations
+  https://github.com/fluent/fluentd/pull/1233
+* Fix to instantiate an unconfigured section even for multi: true
+  https://github.com/fluent/fluentd/pull/1210
+* Add validators of placeholders for buffering key extraction
+  https://github.com/fluent/fluentd/pull/1255
+* Fix to show log messages about filter optimization only when needed
+  https://github.com/fluent/fluentd/pull/1227
+* Add some features to write plugins more easily
+  https://github.com/fluent/fluentd/pull/1256
+
+### Bug fixes
+
+* Fix Oj's default option to encode/decode JSON in the same way with Yajl
+  https://github.com/fluent/fluentd/pull/1147
+  https://github.com/fluent/fluentd/pull/1239
+* Fix to raise correct configuration errors
+  https://github.com/fluent/fluentd/pull/1223
+* Fix a bug to call `shutdown` method (and some others) twice
+  https://github.com/fluent/fluentd/pull/1242
+* Fix to enable `chunk.each` only when it's encoded by msgpack
+  https://github.com/fluent/fluentd/pull/1263
+* Fix a bug not to stop enqueue/flush threads correctly
+  https://github.com/fluent/fluentd/pull/1264
+* out_forward: fix a bug that UDP heartbeat doesn't work
+  https://github.com/fluent/fluentd/pull/1238
+* out_file: fix a crash bug when v0.14 enables symlink and resumes existing buffer file chunk generated by v0.12
+  https://github.com/fluent/fluentd/pull/1234
+* in_monitor_agent: fix compatibility problem between outputs of v0.12 and v0.14
+  https://github.com/fluent/fluentd/pull/1232
+* in_tail: fix a bug to crash to read large amount logs
+  https://github.com/fluent/fluentd/pull/1259
+  https://github.com/fluent/fluentd/pull/1261
+
 ## Release v0.14.6 - 2016/09/07
 
 ### Bug fixes
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index ff93f2561a..d092910f17 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.6'
+  VERSION = '0.14.7'
 
 end