mrege 2.7.5-release into master branch#5642
Merged
chickenlj merged 49 commits intoapache:masterfrom Feb 28, 2020
Merged
Conversation
# Conflicts: # dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java # dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcProtocol.java
…tion but with EnableDubbo/EnableDubboLifecycle not enabled (apache#5496) Fixes apache#5495
…ngly as server instance status change. (apache#5515)
# Conflicts: # dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java # dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/DefaultAccessKeyStorage.java # dubbo-plugin/dubbo-auth/src/main/java/org/apache/dubbo/auth/exception/AccessKeyNotFoundException.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java # dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java # pom.xml
� Conflicts: � dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadlessExecutor.java � dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
Codecov Report
@@ Coverage Diff @@
## master #5642 +/- ##
===========================================
+ Coverage 61.28% 61.3% +0.02%
+ Complexity 498 497 -1
===========================================
Files 981 982 +1
Lines 39042 39117 +75
Branches 5623 5637 +14
===========================================
+ Hits 23925 23979 +54
- Misses 12497 12517 +20
- Partials 2620 2621 +1
Continue to review full report at Codecov.
|
This reverts commit 404dc41
# Conflicts: # dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfiguration.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
cvictory
reviewed
Feb 5, 2020
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
Show resolved
Hide resolved
cvictory
reviewed
Feb 5, 2020
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
Show resolved
Hide resolved
cvictory
reviewed
Feb 5, 2020
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invocation.java
Outdated
Show resolved
Hide resolved
cvictory
reviewed
Feb 5, 2020
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java
Outdated
Show resolved
Hide resolved
cvictory
reviewed
Feb 5, 2020
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
Show resolved
Hide resolved
cvictory
reviewed
Feb 5, 2020
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java
Show resolved
Hide resolved
Contributor
|
Could you add some test about attachment refactor? |
cvictory
reviewed
Feb 5, 2020
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java
Show resolved
Hide resolved
# Conflicts: # dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java # dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java # dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
# Conflicts: # dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java # dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
# Conflicts: # dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.