This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0e4bbb8eadb12e41eca5846030260b895516ff2a Merge: 7acf2db 99c4166 Author: ken.lj <[email protected]> AuthorDate: Tue Aug 4 14:51:11 2020 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 Conflicts: dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
