From 33fe27eb5943d3f969bf0bd15115979f3ac7e7e7 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 23 Aug 2018 10:04:32 +0900
Subject: [PATCH] v1.2.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 080ce32a40..8eac9a015e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # v1.2
 
+## Release v1.2.5 - 2018/08/22
+
+### Bug fixes
+
+* in_tail: Fix resource leak by file rotation
+  https://github.com/fluent/fluentd/pull/2105
+* fix typos
+
 ## Release v1.2.4 - 2018/08/01
 
 ### Bug fixes
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index d69cc5e64d..9509f4b7df 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.5.rc1'
+  VERSION = '1.2.5'
 
 end