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

Rft : merge 1.4 #716

Merged
merged 39 commits into from
Aug 16, 2020
Merged

Rft : merge 1.4 #716

merged 39 commits into from
Aug 16, 2020

Conversation

zouyx
Copy link
Member

@zouyx zouyx commented Aug 16, 2020

What this PR does:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:


zouyx and others added 9 commits August 9, 2020 22:37
Ftr: Update getty and hessian2
# Conflicts:
#	common/constant/key.go
#	common/url.go
#	config_center/apollo/impl.go
#	config_center/apollo/listener.go
#	config_center/nacos/client.go
#	config_center/nacos/listener.go
#	go.mod
#	go.sum
#	protocol/rest/rest_invoker.go
#	registry/nacos/registry.go
#	registry/protocol/protocol.go
@AlexStocks
Copy link
Contributor

@zouyx pls fix the travis failure.

@zouyx
Copy link
Member Author

zouyx commented Aug 16, 2020

@zouyx pls fix the travis failure.

Fixed

@gaoxinge gaoxinge merged commit 5a135e6 into apache:develop Aug 16, 2020
@zouyx zouyx deleted the feature/merge1.4 branch October 9, 2020 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants