tree 3108340050a42fedd40cfbf2d7eb291796948e22
parent 15fc5b473bbeb73b0a6c9ac02f2c8d7e0f6fbe82
parent f0483b80a32e813a4393879744e30d0084c3eafd
author ken.lj <ken.lj.hz@gmail.com> 1614326241 +0800
committer ken.lj <ken.lj.hz@gmail.com> 1614326241 +0800

Merge branch '2.7.9-release'

# Conflicts:
#	dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml
#	dubbo-dependencies-bom/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#	dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/InterfaceCompatibleRegistryProtocol.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/codec/ExchangeCodec.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java
#	pom.xml