This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4672-es-emitter
in repository https://gitbox.apache.org/repos/asf/tika.git
from a62fd73ec1 resolve merge conflicts
add af090b85f2 add units to other timeouts
No new revisions were added by this update.
Summary of changes:
.../resources/elasticsearch/plugins-template.json | 4 ++--
.../test/resources/opensearch/plugins-template.json | 8 ++++----
.../resources/opensearch/tika-config-opensearch.json | 8 ++++----
.../src/test/resources/solr/plugins-template.json | 8 ++++----
.../src/test/resources/tika-config-solr-urls.json | 4 ++--
.../pipes/emitter/opensearch/HttpClientConfig.java | 2 +-
.../pipes/emitter/opensearch/OpenSearchEmitter.java | 4 ++--
.../pipes/reporter/opensearch/HttpClientConfig.java | 2 +-
.../reporter/opensearch/OpenSearchPipesReporter.java | 4 ++--
.../apache/tika/pipes/emitter/solr/SolrEmitter.java | 6 +++---
.../tika/pipes/emitter/solr/SolrEmitterConfig.java | 12 ++++++------
.../tika/pipes/iterator/solr/SolrPipesIterator.java | 6 +++---
.../pipes/iterator/solr/SolrPipesIteratorConfig.java | 20 ++++++++++----------
13 files changed, 44 insertions(+), 44 deletions(-)
