From 2befef01ea7bbc0e1dad47694512675975c06091 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 22 Jun 2017 10:26:22 +0900
Subject: [PATCH] v0.14.18

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

diff --git a/ChangeLog b/ChangeLog
index 8a655f5171..65fb93ed35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 # v0.14
 
+## Release v0.14.18 - 2017/06/21
+
+### New features / Enhancements
+
+* parser: Add rfc5424 regex without priority
+  https://github.com/fluent/fluentd/pull/1600
+
+### Bug fixes
+
+* in_tail: Fix timing issue that the excluded_path doesn't apply.
+  https://github.com/fluent/fluentd/pull/1597
+* config: Fix broken UTF-8 encoded configuration file handling
+  https://github.com/fluent/fluentd/pull/1592
+* out_forward: Don't stop heartbeat when error happen
+  https://github.com/fluent/fluentd/pull/1602
+* Fix command name typo in plugin template
+  https://github.com/fluent/fluentd/pull/1603
+
 ## Release v0.14.17 - 2017/05/29
 
 ### New features / Enhancements
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index ad098ba3e8..444417d3ed 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.17'
+  VERSION = '0.14.18'
 
 end