This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0.6-release in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 6e763a448fd607b64b397c342e85e5301dd4069e Merge: b7b4993 316d171 Author: ken.lj <[email protected]> AuthorDate: Mon Mar 7 15:25:39 2022 +0800 Merge branch '3.0.6-release' into 3.0 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # pom.xml CHANGES.md | 2 + .../remoting/transport/netty4/NettyClient.java | 18 +++++++- .../remoting/transport/netty4/NettyServer.java | 54 ++++++++++++++++++---- 3 files changed, 64 insertions(+), 10 deletions(-)
