From 5d772aa7d2ad81784aadef6264129803397db9a1 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Wed, 14 Oct 2020 04:59:28 +0900
Subject: [PATCH] v1.11.4

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
---
 CHANGELOG.md          | 14 ++++++++++++++
 lib/fluent/version.rb |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac306b410d..33c8038650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # v1.11
 
+## Release v1.11.4 - 2020/10/13
+
+### Enhancement
+
+* inject: Support `unixtime_millis` in `time_type` parameter
+  https://github.com/fluent/fluentd/pull/3145
+
+### Bug fix
+
+* out_http: Fix broken data with `json_array true`
+  https://github.com/fluent/fluentd/pull/3144
+* output: Fix wrong logging issue for `${chunk_id}`
+  https://github.com/fluent/fluentd/pull/3134
+
 ## Release v1.11.3 - 2020/09/30
 
 ### Enhancement
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 085a7dc19b..85714bfae1 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.11.3'
+  VERSION = '1.11.4'
 
 end