From 27e84796ebdd7f4f74c584c0cab244c312536732 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 2 Aug 2018 10:38:15 +0900
Subject: [PATCH] v1.2.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 245f205a80..080ce32a40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # v1.2
 
+## Release v1.2.4 - 2018/08/01
+
+### Bug fixes
+
+* output: Consider timezone when calculate timekey
+  https://github.com/fluent/fluentd/pull/2054
+* output: Fix bug in suppress_emit_error_log_interval
+  https://github.com/fluent/fluentd/pull/2069
+* server-helper: Fix connection leak by close timing issue.
+  https://github.com/fluent/fluentd/pull/2087
+
 ## Release v1.2.3 - 2018/07/10
 
 ### Enhancements
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 414327134e..54f2b1ea99 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.4.rc1'
+  VERSION = '1.2.4'
 
 end