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.

Sign up for GitHub

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

Jump to bottom

Merge develop into feature/grpc and resolve conflicts #312

Merged
merged 37 commits into from
Jan 11, 2020
Merged

Merge develop into feature/grpc and resolve conflicts #312

merged 37 commits into from
Jan 11, 2020

Conversation

flycash
Copy link
Member

@flycash flycash commented Jan 9, 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?:

pantianying and others added 30 commits November 23, 2019 22:26
@pantianying
Merge branch 'develop' of https://github.com/apache/dubbo-go into apa…
47066c2 
…che-develop
@pantianying
Merge branch 'develop' of https://github.com/apache/dubbo-go into apa…
5f5cfb7 
…che-develop
@pantianying
Merge branch 'develop' of https://github.com/apache/dubbo-go into apa…
ebb35e8 
…che-develop
@pantianying
Merge branch 'develop' of https://github.com/apache/dubbo-go into apa…
411435c 
…che-develop
@pantianying
add code for request_timeout
9723e7b
@micln
upgrade gost v1.5
8c24e5e
@AlexStocks
Merge pull request apache#296 from micln/upgrade
8dd1b0d 
upgrade hessian2 & gost v1.5
@AlexStocks
Revert "upgrade hessian2 & gost v1.5"
9ef93b8
@AlexStocks
Merge pull request apache#299 from apache/revert-296-upgrade
ab78c63 
Revert "upgrade hessian2 & gost v1.5"
@micln
gost 1.5.1
ad79b88
@zouyx
delete mock json
70aed98
@pantianying
add code
400c388
@pantianying
Merge branch 'apache-develop' into develop_req_timeout_config
8517ede 
# Conflicts:
#	config/method_config.go
#	config/reference_config.go
@pantianying
merge code
625c571
@pantianying
fix bug
9bdc231
@pantianying
fix bug
52fbe96
@pantianying
fix bug
311135a
@pantianying
modify the format of the incoming package
4226997
@fangyincheng
revert filter dir
62e7207
@micln
upgrade hessian2
b0dbcb8
@micln
Merge remote-tracking branch 'upstream/develop' into dev
d451c2d
@zouyx
delete mock json in apollo test case
e7aa7e5
@fangyincheng
Merge pull request apache#304 from zouyx/feature/deleteMockJson
e8cc8c7 
Add : delete mock json in test case of apollo
@fangyincheng
modify filter dir
c95940a
@AlexStocks
Merge pull request apache#307 from micln/dev
03c6a4a 
upgrade hessian2@master & gost@1.5.1
@pantianying
remove one const
b2b66c3
@Patrick0308
add GenericServiceFilter in README.md
3110d49
@fangyincheng
modify filter dir & version
a92d606
@fangyincheng
Merge remote-tracking branch 'apache/develop' into develop
92af46e
@fangyincheng
Merge pull request apache#284 from pantianying/develop_req_timeout_co…
bfa60ea 
…nfig

Ftr: Develop req timeout config
@AlexStocks
Merge pull request apache#310 from Patrick0308/modify-readme
2c86ec0 
Adding GenericServiceFilter in README
@flycash flycash requested a review from fangyincheng January 9, 2020 13:04
@codecov-io
Copy link

codecov-io commented Jan 10, 2020 •
edited
Loading

Codecov Report

Merging #312 into feature/grpc will increase coverage by 0.31%.
The diff coverage is 83.73%.

Impacted file tree graph

@@              Coverage Diff               @@
##           feature/grpc   #312      +/-   ##
==============================================
+ Coverage         65.69%    66%   +0.31%     
==============================================
  Files               113    118       +5     
  Lines              7255   7396     +141     
==============================================
+ Hits               4766   4882     +116     
- Misses             2013   2027      +14     
- Partials            476    487      +11
Impacted Files Coverage Δ
remoting/zookeeper/client.go 63.87% <ø> (ø) ⬆️
protocol/protocolwrapper/mock_protocol_filter.go 0% <0%> (ø) ⬆️
registry/zookeeper/registry.go 55.55% <100%> (+0.15%) ⬆️
registry/protocol/protocol.go 81.73% <100%> (ø) ⬆️
remoting/zookeeper/listener.go 47.44% <100%> (+0.54%) ⬆️
common/proxy/proxy.go 97.87% <100%> (+0.11%) ⬆️
protocol/dubbo/dubbo_protocol.go 91.83% <100%> (ø) ⬆️
protocol/grpc/grpc_exporter.go 100% <100%> (ø)
protocol/jsonrpc/jsonrpc_protocol.go 91.83% <100%> (ø) ⬆️
registry/directory/directory.go 83.78% <100%> (+0.11%) ⬆️
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4bd2851...47131f2. Read the comment docs.

fangyincheng
fangyincheng approved these changes Jan 11, 2020
View reviewed changes
Copy link
Contributor

@fangyincheng fangyincheng left a comment

Choose a reason for hiding this comment

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

LGTM

@fangyincheng fangyincheng merged commit 78818e8 into apache:feature/grpc Jan 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fangyincheng fangyincheng fangyincheng approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@flycash @codecov-io @fangyincheng @pantianying @micln @AlexStocks @zouyx @Patrick0308