This is an automated email from the ASF dual-hosted git repository.
tballison pushed a change to branch TIKA-476x-merge-conflicts
in repository https://gitbox.apache.org/repos/asf/tika.git
from 4d91c53f28 TIKA-4764 and TIKA-4763 merge conflicts
add 493814a3de TIKA-476x - fix merge conflicts, simplify tika.proto
No new revisions were added by this update.
Summary of changes:
docs/modules/ROOT/pages/using-tika/grpc/index.adoc | 24 ++--
tika-grpc/README.md | 10 +-
.../org/apache/tika/pipes/grpc/TikaGrpcConfig.java | 34 +++---
.../apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 132 ++++++++++++---------
tika-grpc/src/main/proto/tika.proto | 19 +--
.../apache/tika/pipes/grpc/TikaGrpcServerTest.java | 67 +++++++++--
.../tika/pipes/emitter/fs/FileSystemEmitter.java | 13 +-
.../pipes/emitter/fs/FileSystemEmitterConfig.java | 2 +-
.../pipes/emitter/fs/FileSystemEmitterTest.java | 85 +++++++++++++
9 files changed, 285 insertions(+), 101 deletions(-)
create mode 100644
tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/test/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterTest.java
