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 2019/12/09 06:43:40 UTC
[dubbo] 01/01: Merge branch 'master' into 2.7.5-release
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.5-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit a6b13661e586edab7a2fa64b6bfff0e05652081c
Merge: 0edeffc 97e20f5
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Dec 9 14:43:08 2019 +0800
Merge branch 'master' into 2.7.5-release
# 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
.github/workflows/ci.yml | 17 -----
.../cluster/configurator/AbstractConfigurator.java | 6 +-
.../dubbo/common/constants/CommonConstants.java | 4 +
.../org/apache/dubbo/config/ProtocolConfig.java | 2 +
.../java/org/apache/dubbo/config/SslConfig.java | 89 ++++++++++++++++++++++
.../apache/dubbo/config/context/ConfigManager.java | 6 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 6 +-
.../org/apache/dubbo/config/ServiceConfig.java | 6 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 7 ++
.../apache/dubbo/config/spring/ReferenceBean.java | 2 +
.../apache/dubbo/config/spring/ServiceBean.java | 2 +
.../annotation/DubboConfigConfiguration.java | 4 +-
.../spring/schema/DubboNamespaceHandler.java | 2 +
.../src/main/resources/META-INF/compat/dubbo.xsd | 59 ++++++++++++++
.../src/main/resources/META-INF/dubbo.xsd | 59 ++++++++++++++
.../support/apollo/ApolloDynamicConfiguration.java | 11 ++-
.../support/nacos/NacosDynamicConfiguration.java | 39 +++++++++-
dubbo-dependencies-bom/pom.xml | 2 +-
.../metadata/store/nacos/NacosMetadataReport.java | 41 +++++++++-
.../registry/integration/RegistryProtocol.java | 41 +++++-----
.../nacos/util/NacosNamingServiceUtils.java | 37 ++++++++-
.../java/org/apache/dubbo/remoting/Constants.java | 12 ---
.../remoting/transport/netty4/NettyClient.java | 2 +-
.../remoting/transport/netty4/NettyServer.java | 2 +-
.../remoting/transport/netty4/SslContexts.java | 51 ++++++-------
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 26 +++----
.../dubbo/rpc/protocol/grpc/GrpcOptionsUtils.java | 50 ++++++------
.../dubbo/rpc/protocol/grpc/GrpcProtocol.java | 57 --------------
28 files changed, 444 insertions(+), 198 deletions(-)