Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: compatible with acm #2699

Merged
merged 6 commits into from
May 23, 2020

Conversation

wangwengeek
Copy link
Contributor

seata config compatible aliyun acm endpoint

@wangwengeek
Copy link
Contributor Author

因为 我们要从自己搭的nacos环境切换到阿里云上的 MSE+ACM,但是ACM(配置中心)使用nacos api只能使用endpoint不能使用serverAddr,所以在pr中增加了使用endpoint的兼容

@codecov-commenter
Copy link

codecov-commenter commented May 20, 2020

Codecov Report

Merging #2699 into develop will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2699      +/-   ##
=============================================
+ Coverage      51.12%   51.13%   +0.01%     
- Complexity      2847     2849       +2     
=============================================
  Files            566      566              
  Lines          18072    18072              
  Branches        2141     2141              
=============================================
+ Hits            9240     9242       +2     
  Misses          7944     7944              
+ Partials         888      886       -2     
Impacted Files Coverage Δ Complexity Δ
...in/java/io/seata/server/session/GlobalSession.java 84.16% <0.00%> (+0.45%) 72.00% <0.00%> (+1.00%)
...o/seata/server/coordinator/DefaultCoordinator.java 55.15% <0.00%> (+0.51%) 29.00% <0.00%> (+1.00%)

@funky-eyes
Copy link
Contributor

change the title to feature: compatible acm

@wangwengeek
Copy link
Contributor Author

已经测试通过 seata server能注册上,client 能注册到server

@jsbxyyx jsbxyyx changed the title Feature/compatible acm Feature: compatible acm May 21, 2020
Copy link
Contributor

@l81893521 l81893521 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@jsbxyyx jsbxyyx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@l81893521 l81893521 changed the title Feature: compatible acm Feature: compatible with acm May 23, 2020
@l81893521 l81893521 merged commit 7c38bb0 into apache:develop May 23, 2020
@slievrly slievrly added this to the 1.3.0 milestone Jun 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/config config module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants