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 2022/09/29 03:02:57 UTC

[dubbo] 03/03: Merge branch 'apache-3.0' into apache-3.1

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

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

commit 58e150422f2247e01302ecbb72c7a3b447774cbb
Merge: 9dbc320e65 c374c0e6ac
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Thu Sep 29 11:01:37 2022 +0800

    Merge branch 'apache-3.0' into apache-3.1
    
    # Conflicts:
    #       dubbo-dependencies-bom/pom.xml
    #       dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
    #       dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
    #       pom.xml