From 23a9609f6a2c8937fc18e19ea96865bfccb2b2cd Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Sat, 10 Nov 2018 15:09:18 +0900
Subject: [PATCH] v1.3.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4723c4b408..a9ae6630d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# v1.3
+
+## Release v1.3.0 - 2018/11/10
+
+### New features
+
+* output: Change thread execution control
+  https://github.com/fluent/fluentd/pull/2170
+* in_syslog: Support octet counting frame
+  https://github.com/fluent/fluentd/pull/2147
+* Use `flush_thread_count` value for `queued_chunks_limit_size` when `queued_chunks_limit_size` is not specified
+  https://github.com/fluent/fluentd/pull/2173
+
+### Enhancements
+
+* output: Show backtrace for unrecoverable errors
+  https://github.com/fluent/fluentd/pull/2149
+* in_http: Implement support for CORS preflight requests
+  https://github.com/fluent/fluentd/pull/2144
+
+### Bug fixes
+
+* server: Fix deadlock between on_writable and close in sockets
+  https://github.com/fluent/fluentd/pull/2165
+* output: show correct error when wrong plugin is specified for secondary
+  https://github.com/fluent/fluentd/pull/2169
+
 # v1.2
 
 ## Release v1.2.6 - 2018/10/03
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 8fe971514f..7b2f4d8707 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.6'
+  VERSION = '1.3.0'
 
 end