You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/02 06:28:16 UTC

[dubbo] 01/02: Merge branch '3.0.1-release' into apache-3.0

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 99256faf8f31bb80a45605442478f1b1b605c34a
Merge: 810c824 aa3fe7b
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Jul 2 14:26:33 2021 +0800

    Merge branch '3.0.1-release' into apache-3.0
    
    # Conflicts:
    #	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/reference/javaconfig/JavaConfigReferenceBeanTest.java
    #	dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java
    #	dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-generic-consumer.xml

 .../main/java/org/apache/dubbo/common/constants/CommonConstants.java   | 2 ++
 .../main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java    | 1 +
 .../main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java | 3 ++-
 dubbo-dependencies-bom/pom.xml                                         | 2 +-
 dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml                | 2 +-
 pom.xml                                                                | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)