This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from f5df7edcdf resolve conflict
add 2c6a933d3a Change some test-related error code to a separate series.
(#11219)
add f03f374397 Enhance Zookeeper ServiceDiscovery update (#11220)
new 3375f727e1 Merge branch 'apache-3.1' into apache-3.2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-and-test-pr.yml | 4 +-
.../common/constants/LoggerCodeConstants.java | 29 ++++++--
.../org/apache/dubbo/common/utils/PojoUtils.java | 4 +-
.../org/apache/dubbo/config/AbstractConfig.java | 4 +-
.../rpc/model/ReflectionMethodDescriptor.java | 4 +-
.../common/logger/support/FailsafeLoggerTest.java | 33 +++++----
.../dubbo/config/spring/EmbeddedZooKeeper.java | 8 +--
.../zookeeper/ZookeeperServiceDiscovery.java | 81 ++++++----------------
.../ZookeeperServiceDiscoveryChangeWatcher.java | 67 +++++++-----------
.../zookeeper/util/CuratorFrameworkUtils.java | 59 ----------------
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 4 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 6 +-
.../protocol/tri/stream/TripleClientStream.java | 4 +-
.../initializer/DownloadZookeeperInitializer.java | 4 +-
.../processor/ZookeeperUnixProcessor.java | 8 +--
15 files changed, 113 insertions(+), 206 deletions(-)
