This is an automated email from the ASF dual-hosted git repository.
tballison pushed a change to branch fix-merge-conflict
in repository https://gitbox.apache.org/repos/asf/tika.git
from 343d9bb07e merge conflict
add 7d631ffbec flaky tests
No new revisions were added by this update.
Summary of changes:
.../src/test/java/org/apache/tika/pipes/core/PipesClientTest.java | 8 ++++----
.../org/apache/tika/pipes/core/SharedServerChaosMonkeyTest.java | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
