From 500ed50bd02e35ffe1fa1a73aa676e377c679aca Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 4 Oct 2018 09:21:31 +0900
Subject: [PATCH] v1.2.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8eac9a015e..4723c4b408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # v1.2
 
+## Release v1.2.6 - 2018/10/03
+
+### Enhancements
+
+* output: Add `disable_chunk_backup` for ignore broken chunks.
+  https://github.com/fluent/fluentd/pull/2117
+* parser_syslog: Improve regexp for RFC5424
+  https://github.com/fluent/fluentd/pull/2141
+* in_http: Allow specifying the wildcard '*' as the CORS domain
+  https://github.com/fluent/fluentd/pull/2139
+
+### Bug fixes
+
+* in_tail: Prevent thread switching in the interval between seek and read/write operations to pos_file
+  https://github.com/fluent/fluentd/pull/2118
+* parser: Handle LoadError properly for oj
+  https://github.com/fluent/fluentd/pull/2140
+
 ## Release v1.2.5 - 2018/08/22
 
 ### Bug fixes
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 9509f4b7df..8fe971514f 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 
 end