Merge pull request #633 from ywy2090/release-1.2.6

update ChangeLog and release_node
FISCO-BCOS · Jun 13, 2020 · d5d1a67 · d5d1a67
2 parents 1a803d0 + 19bce1a
commit d5d1a67
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -1 +1 @@
-V1.2.5
+V1.2.6