From fa35835d9a085023d7b496a81790948e7581a446 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Tue, 6 Mar 2018 06:08:01 +0900
Subject: [PATCH] v1.1.1

---
 CHANGELOG.md          | 28 ++++++++++++++++++++++++++++
 lib/fluent/version.rb |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d95e4c1956..538a89e16b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # v1.1
 
+## Release v1.1.1 - 2018/03/05
+
+### Enhancements
+
+* in_debug_agent: Support multi worker environment
+  https://github.com/fluent/fluentd/pull/1869
+* in_forward: Improve SSL setup to support mutual TLS
+  https://github.com/fluent/fluentd/pull/1861
+* buf_file: Skip and delete broken file chunks to avoid unsuccessful retry in resume
+  https://github.com/fluent/fluentd/pull/1874
+* command: Show fluentd version for debug purpose
+  https://github.com/fluent/fluentd/pull/1839
+
+### Bug fixes
+
+* in_forward: Do not close connection until write is complete on failed auth PONG
+  https://github.com/fluent/fluentd/pull/1835
+* in_tail: Fix IO event race condition during shutdown
+  https://github.com/fluent/fluentd/pull/1876
+* in_http: Emit event time instead of raw time value in batch
+  https://github.com/fluent/fluentd/pull/1850
+* parser_json: Add EncodingError to rescue list for oj 3.x.
+  https://github.com/fluent/fluentd/pull/1875
+* config: Fix config_param for string type with frozen string
+  https://github.com/fluent/fluentd/pull/1838
+* timer: Fix a bug to leak non-repeating timer watchers
+  https://github.com/fluent/fluentd/pull/1864
+
 ## Release v1.1.0 - 2018/01/17
 
 ### New features / Enhancements
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index b95fe5816a..05593b660f 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
 end