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 2021/02/26 08:32:34 UTC

[dubbo] 02/02: Merge branch 'master' of https://github.com/apache/dubbo

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 4ad263422dd7304039848404f507ddca221b32d9
Merge: b939b34 24ca37b
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Feb 26 16:31:14 2021 +0800

    Merge branch 'master' of https://github.com/apache/dubbo

 .../org/apache/dubbo/common/config/configcenter/Constants.java |  1 +
 .../config/configcenter/TreePathDynamicConfiguration.java      |  2 +-
 .../main/java/org/apache/dubbo/common/extension/Wrapper.java   |  4 ++++
 .../dubbo/config/context/ConfigConfigurationAdapter.java       |  2 +-
 .../java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java |  1 -
 .../config/spring/context/annotation/EnableDubboConfig.java    |  5 +++--
 .../support/apollo/ApolloDynamicConfiguration.java             |  2 +-
 .../configcenter/support/etcd/EtcdDynamicConfiguration.java    |  2 +-
 .../src/main/resources/META-INF/assembly/bin/start.sh          | 10 +++++-----
 .../apache/dubbo/metadata/report/MetadataReportInstance.java   |  3 +++
 .../main/java/org/apache/dubbo/remoting/exchange/Request.java  | 10 ++++++++++
 .../apache/dubbo/remoting/exchange/support/DefaultFuture.java  |  2 +-
 12 files changed, 31 insertions(+), 13 deletions(-)