This is an automated email from the ASF dual-hosted git repository. zhouxzhan pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 373c1bd13ef7148bc9d04db155bed77d98e00429 Author: zhouxiang <[email protected]> AuthorDate: Fri Dec 9 10:23:23 2022 +0800 [ISSUE #5485] Fix merge code issue --- proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java index 4d5084cfd..9c833ba8a 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/config/ProxyConfig.java @@ -1173,7 +1173,6 @@ public class ProxyConfig implements ConfigFile { public void setChannelExpiredTimeout(long channelExpiredTimeout) { this.channelExpiredTimeout = channelExpiredTimeout; } -} public void setEnableRemotingLocalProxyGrpc(boolean enableRemotingLocalProxyGrpc) { this.enableRemotingLocalProxyGrpc = enableRemotingLocalProxyGrpc;
