You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/13 12:31:34 UTC

[lucene-solr] 01/07: Merge remote-tracking branch 'origin/master' into gradle-master

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 035cede6b872d4a34d150d3b7120289879227502
Merge: a392a83 f083f40
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 10:51:14 2019 +0100

    Merge remote-tracking branch 'origin/master' into gradle-master

 lucene/common-build.xml                            |  1 -
 lucene/tools/junit4/solr-tests.policy              |  7 ----
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |  1 +
 .../src/test/org/apache/hadoop/fs/HardLink.java    |  1 +
 .../org/apache/hadoop/fs/RawLocalFileSystem.java   |  2 ++
 .../datanode/fsdataset/impl/BlockPoolSlice.java    |  4 ++-
 .../server/namenode/NameNodeResourceChecker.java   |  2 ++
 .../test/org/apache/hadoop/http/HttpServer2.java   |  2 ++
 .../src/test/org/apache/hadoop/package-info.java   | 39 ++++++++++++++++++++++
 .../test/org/apache/hadoop/util/DiskChecker.java   |  2 ++
 .../SearchRateTriggerIntegrationTest.java          |  6 ++++
 .../org/apache/solr/cloud/hdfs/HdfsTestUtil.java   | 29 ++++++++++++++++
 .../impl/ConcurrentUpdateHttp2SolrClient.java      | 11 ++++--
 .../solrj/impl/ConcurrentUpdateSolrClient.java     | 10 +++++-
 14 files changed, 105 insertions(+), 12 deletions(-)