Skip to content

Commit d32cabd

Browse files
authored
Merge branch '2.x' into feat/add-whiteList
2 parents 0696b1d + e006d10 commit d32cabd

File tree

15 files changed

+3659
-1
lines changed

15 files changed

+3659
-1
lines changed

changes/en-us/2.x.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Add changes here for all PR submitted to the 2.x branch.
2525
- [[#7865](https://github.com/apache/incubator-seata/pull/7865)] add Benchmark CLI tool
2626
- [[#7973](https://github.com/apache/incubator-seata/pull/7973)] Added JSON whitelist security mechanism
2727
- [[#7903](https://github.com/apache/incubator-seata/pull/7903)] Support HTTP/2 stream push for the Watch API in Server Raft mode
28-
28+
- [[#8002](https://github.com/apache/incubator-seata/pull/8002)] add Grafana dashboard JSON for NamingServer metrics
2929

3030
### bugfix:
3131

@@ -53,6 +53,7 @@ Add changes here for all PR submitted to the 2.x branch.
5353

5454
- [[#7962](https://github.com/apache/incubator-seata/pull/7962)] add unit tests for NacosRegistryProvider and NacosRegistryServiceImpl
5555
- [[#8003](https://github.com/apache/incubator-seata/pull/8003)] Enhance NacosRegistryServiceImplTest with additional mocks for service name group and cluster
56+
- [[#7915](https://github.com/apache/incubator-seata/pull/7915)] add unit tests for saga-engine low coverage components
5657

5758
### refactor:
5859

changes/zh-cn/2.x.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
- [[#7865](https://github.com/apache/incubator-seata/pull/7865)] 新增 Benchmark 命令行工具
2727
- [[#7973](https://github.com/apache/incubator-seata/pull/7973)] 添加了 JSON 白名单安全机制
2828
- [[#7903](https://github.com/apache/incubator-seata/pull/7903)] 在Server Raft模式下支持Watch API的HTTP/2流推送
29+
- [[#8002](https://github.com/apache/incubator-seata/pull/8002)] 为namingserver指标增加Grafana dashboard JSON
2930

3031
### bugfix:
3132

@@ -58,6 +59,7 @@
5859

5960
- [[#7962](https://github.com/apache/incubator-seata/pull/7962)] 为 NacosRegistryProvider 和 NacosRegistryServiceImpl 添加单元测试用例
6061
- [[#8003](https://github.com/apache/incubator-seata/pull/8003)] 为 NacosRegistryServiceImplTest 增加服务名称、分组和集群的额外模拟
62+
- [[#7915](https://github.com/apache/incubator-seata/pull/7915)] 为 saga-engine 添加单元测试用例
6163

6264

6365
### refactor:

0 commit comments

Comments
 (0)