From 19bce1aa2068b98a875c6fb94f153c89217e8906 Mon Sep 17 00:00:00 2001
From: octopus <912554887@qq.com>
Date: Sat, 13 Jun 2020 08:39:45 +0800
Subject: [PATCH] update ChangeLog and release_node

---
 Changelog.md     | 12 ++++++++++++
 release_note.txt |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 977d77185..6cf5ef75e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,15 @@
+### V1.2.6 (2020-06-09)
+
+* 删除
+1. fastjson依赖
+
+* 更新
+1. netty-all升级至4.1.50.Final版本
+2. spring升级至4.3.27.RELEASE版本
+3. slf4j升级至1.7.30版本
+4. jackson-databind升级至2.11.0版本
+4. guava至升级29.0-jre版本
+
 ### V1.2.5 (2019-01-17)
 * Updates
 
diff --git a/release_note.txt b/release_note.txt
index 8c6ec8e60..00fe7f7ba 100644
--- a/release_note.txt
+++ b/release_note.txt
@@ -1 +1 @@
-V1.2.5
+V1.2.6