This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git.
from eb8668a GEODE-8382: Run Redis tests against Redis API for Geode (#5416) add d6c3b1f GEODE-8407: MergeLogFiles fails to include files with the same name b… (#5428) No new revisions were added by this update. Summary of changes: .../logging/MergeLogFilesIntegrationTest.java | 33 + .../geode/internal/logging/dir1/systemlog.txt | 992 ++++++++++++ .../geode/internal/logging/dir2/systemlog.txt | 1571 ++++++++++++++++++++ .../geode/internal/logging/MergeLogFiles.java | 58 +- 4 files changed, 2641 insertions(+), 13 deletions(-) create mode 100644 geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/dir1/systemlog.txt create mode 100644 geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/dir2/systemlog.txt