You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/03/31 10:15:12 UTC
[dubbo] 01/01: Merge branch '2.7.6-release'
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 95bee527a160176f055d7519e0e57a739b7ad672
Merge: cb12928 af4cff2
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Mar 31 18:14:02 2020 +0800
Merge branch '2.7.6-release'
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
# pom.xml
CHANGES.md | 21 ++
.../cluster/support/MergeableClusterInvoker.java | 8 +-
.../rpc/cluster/directory/MockDirInvocation.java | 20 ++
.../java/org/apache/dubbo/common/Experimental.java | 37 +++
.../org/apache/dubbo/common/utils/HttpUtils.java | 264 ---------------------
.../org/apache/dubbo/common/utils/PathUtils.java | 69 ++++++
.../apache/dubbo/config/context/ConfigManager.java | 1 -
.../java/com/alibaba/dubbo/rpc/Invocation.java | 22 +-
.../main/java/com/alibaba/dubbo/rpc/Result.java | 10 +
.../org/apache/dubbo/service/MockInvocation.java | 20 ++
.../org/apache/dubbo/config/DubboShutdownHook.java | 14 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 52 ++--
...pertyDefaultValueDubboConfigBeanCustomizer.java | 86 +++++++
.../consul/ConsulDynamicConfiguration.java | 2 +-
.../consul/ConsulDynamicConfigurationTest.java | 2 +-
.../dubbo/metadata/rest/RequestMetadata.java | 4 +-
.../jaxrs/JAXRSServiceRestMetadataResolver.java | 2 +-
.../SpringMvcServiceRestMetadataResolver.java | 2 +-
.../store/RemoteWritableMetadataService.java | 40 ++--
.../java/org/apache/dubbo/metadata/rest/User.java | 13 +-
.../store/RemoteWritableMeatadataServiceTest.java | 8 +-
.../jaxrs/JAXRSServiceRestMetadataResolver.java | 2 +-
.../SpringMvcServiceRestMetadataResolver.java | 2 +-
.../java/org/apache/dubbo/metadata/rest/User.java | 13 +-
.../java/org/apache/dubbo/rpc/AppResponse.java | 10 +
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 10 +
.../main/java/org/apache/dubbo/rpc/Invocation.java | 18 +-
.../src/main/java/org/apache/dubbo/rpc/Result.java | 16 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 16 +-
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 20 ++
.../apache/dubbo/rpc/support/MockInvocation.java | 20 ++
31 files changed, 457 insertions(+), 367 deletions(-)