This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.6.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.6.0 by this push:
new ee24d16ee0 doc: update changes (#7935) (#7945)
ee24d16ee0 is described below
commit ee24d16ee02604be0953a48a4ca01998445c38b6
Author: Kang Minseok <[email protected]>
AuthorDate: Fri Jan 16 10:41:10 2026 +0900
doc: update changes (#7935) (#7945)
---
changes/en-us/2.6.0.md | 2 ++
changes/zh-cn/2.6.0.md | 2 ++
2 files changed, 4 insertions(+)
diff --git a/changes/en-us/2.6.0.md b/changes/en-us/2.6.0.md
index f8bbfb3789..5265fba816 100644
--- a/changes/en-us/2.6.0.md
+++ b/changes/en-us/2.6.0.md
@@ -125,6 +125,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7913](https://github.com/apache/incubator-seata/pull/7913)] remove
@author info
- [[#7931](https://github.com/apache/incubator-seata/pull/7931)] pin the
Spring version for namingserver and console
- [[#7942](https://github.com/apache/incubator-seata/pull/7942)] update
jib-maven-plugin version and increase parallel test execution limits
+- [[#7935](https://github.com/apache/incubator-seata/pull/7935)] add OkHttp
and MockWebServer dependencies to resolve version conflicts
### security:
@@ -241,6 +242,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [aias00](https://github.com/aias00)
- [NiMv1](https://github.com/NiMv1)
- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+- [neronsoda](https://github.com/neronsoda)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.6.0.md b/changes/zh-cn/2.6.0.md
index 86f982ffab..d022ec485a 100644
--- a/changes/zh-cn/2.6.0.md
+++ b/changes/zh-cn/2.6.0.md
@@ -124,6 +124,7 @@
- [[#7913](https://github.com/apache/incubator-seata/pull/7913)] 移除 @author 信息
- [[#7931](https://github.com/apache/incubator-seata/pull/7931)]
固定namingserver和console的spring版本
- [[#7942](https://github.com/apache/incubator-seata/pull/7942)]
升级jib-maven-plugin版本和提高ci并行度
+- [[#7935](https://github.com/apache/incubator-seata/pull/7935)] 添加 OkHttp 和
MockWebServer 依赖来解决版本冲突
### security:
@@ -239,6 +240,7 @@
- [diguage](https://github.com/diguage)
- [aias00](https://github.com/aias00)
- [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
+- [neronsoda](https://github.com/neronsoda)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
