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

[Dubbo-4525] same as #4533, fix ClusterUtils.mergeUrl #4540

Merged

Conversation

chickenlj
Copy link
Contributor

No description provided.

qixiaobo and others added 3 commits July 11, 2019 10:33
* Dubbo throws exception when use java serializer
issues:
apache#3951
apache#3698

* Dubbo throws exception when use java serializer
issues:
apache#3951
apache#3698

fix travis-ci
UnusedImports
…provider side not override by that from consumer.
Copy link
Contributor

@cvictory cvictory left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov-io
Copy link

codecov-io commented Jul 11, 2019

Codecov Report

Merging #4540 into 2.6.7-release will decrease coverage by 0.05%.
The diff coverage is 36.36%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##             2.6.7-release    #4540      +/-   ##
===================================================
- Coverage            47.01%   46.96%   -0.06%     
+ Complexity            4377     4376       -1     
===================================================
  Files                  562      562              
  Lines                25041    25043       +2     
  Branches              4417     4418       +1     
===================================================
- Hits                 11773    11761      -12     
- Misses               11441    11455      +14     
  Partials              1827     1827
Impacted Files Coverage Δ Complexity Δ
...libaba/dubbo/rpc/cluster/support/ClusterUtils.java 64.7% <33.33%> (-1.26%) 1 <0> (ø)
...m/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java 59.37% <40%> (-0.83%) 13 <0> (ø)
...aba/dubbo/remoting/transport/mina/MinaChannel.java 42.25% <0%> (-11.27%) 15% <0%> (-1%)
...a/dubbo/remoting/transport/netty/NettyChannel.java 57.5% <0%> (-7.5%) 19% <0%> (-1%)
...bo/remoting/transport/netty/NettyCodecAdapter.java 53.12% <0%> (-1.57%) 3% <0%> (ø)
...rpc/cluster/loadbalance/RoundRobinLoadBalance.java 86.76% <0%> (-1.48%) 12% <0%> (-1%)
...baba/dubbo/remoting/transport/mina/MinaClient.java 59.37% <0%> (+1.56%) 9% <0%> (+1%) ⬆️
...onfig/spring/extension/SpringExtensionFactory.java 77.77% <0%> (+2.77%) 9% <0%> (ø) ⬇️
...ba/dubbo/remoting/transport/netty/NettyServer.java 71.42% <0%> (+3.57%) 9% <0%> (+1%) ⬆️

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 7e041b2...b772644. Read the comment docs.

@cvictory
Copy link
Contributor

The project build failed in jdk1.7. And ignore it temporary.

@cvictory cvictory merged commit 0ea3e28 into apache:2.6.7-release Jul 12, 2019
@mercyblitz mercyblitz modified the milestones: 2.7.3, 2.6.7 Jul 12, 2019
@chickenlj chickenlj deleted the clusterutils-mergeurl-tag-26x branch September 3, 2019 02:35
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.

None yet

5 participants