From e576dd4b03b5c15820e91040f963913b6e0ca276 Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Thu, 30 Nov 2017 00:04:25 +0900
Subject: [PATCH] v1.0.0.rc1

---
 CHANGELOG.md          | 16 ++++++++++++++++
 lib/fluent/version.rb |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbb370113d..c781e130ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# v1.0
+
+## Release v1.0.0.rc1 - 2017/11/29
+
+### New features / Enhancements
+
+* Disable tracepoint feature to omit unnecessary insts
+  https://github.com/fluent/fluentd/pull/1764
+
+### Bug fixes
+
+* out_forward: Don't update retry state when failed to get ack response.
+  https://github.com/fluent/fluentd/pull/1686
+* plugin: Combine before_shutdown and shutdown call in one sequence.
+  https://github.com/fluent/fluentd/pull/1763
+
 # v0.14
 
 ## Release v0.14.24 - 2017/11/24
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 7931bf36d7..d0118c0330 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.24'
+  VERSION = '1.0.0.rc1'
 
 end