From 029bb4bfacf91feebc7fa22edf6fc39bdd810890 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Wed, 11 Jul 2018 11:57:32 +0900
Subject: [PATCH] v1.2.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29096d0f39..245f205a80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # v1.2
 
+## Release v1.2.3 - 2018/07/10
+
+### Enhancements
+
+* in_http: Consider `<parse>` parameters in batch mode
+  https://github.com/fluent/fluentd/pull/2055
+* in_http: Support gzip payload
+  https://github.com/fluent/fluentd/pull/2060
+* output: Improve compress performance
+  https://github.com/fluent/fluentd/pull/2031
+* in_monitor_agent: Add missing descriptions for configurable options
+  https://github.com/fluent/fluentd/pull/2037
+* parser_syslog: update regex of pid field for conformance to RFC5424 spec
+  https://github.com/fluent/fluentd/pull/2051
+
+### Bug fixes
+
+* in_tail: Fix to rescue Errno::ENOENT for File.mtime()
+  https://github.com/fluent/fluentd/pull/2063
+* fluent-plugin-generate: Fix Parser plugin template
+  https://github.com/fluent/fluentd/pull/2026
+* fluent-plugin-config-format: Fix NoMethodError for some plugins
+  https://github.com/fluent/fluentd/pull/2023
+* config: Don't warn message for reserved parameters in DSL
+  https://github.com/fluent/fluentd/pull/2034
+
 ## Release v1.2.2 - 2018/06/12
 
 ### Enhancements
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index f468a90434..2cad78567c 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 
 end