From 404a48b89f58c1fd783c2adbd1f50478085856a2 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Mon, 29 May 2017 16:24:07 +0900
Subject: [PATCH] v0.14.17

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

diff --git a/ChangeLog b/ChangeLog
index 43a2b0e575..8a655f5171 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 # v0.14
 
+## Release v0.14.17 - 2017/05/29
+
+### New features / Enhancements
+
+* in_tail: Add ignore_repeated_permission_error
+  https://github.com/fluent/fluentd/pull/1574
+* server: Accept private key for TLS server without passphrase
+  https://github.com/fluent/fluentd/pull/1575
+* config: Validate workers option on standalone mode
+  https://github.com/fluent/fluentd/pull/1577
+
+### Bug fixes
+
+* config: Mask all secret parameters in worker section
+  https://github.com/fluent/fluentd/pull/1580
+* out_forward: Fix ack handling
+  https://github.com/fluent/fluentd/pull/1581
+* plugin-config-format: Fix markdown format generator
+  https://github.com/fluent/fluentd/pull/1585
+
 ## Release v0.14.16 - 2017/05/13
 
 ### New features / Enhancements
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index d3eeb3c85f..ad098ba3e8 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.16'
+  VERSION = '0.14.17'
 
 end