tree 5fbff4cf63d5d695319b3de5acdd86dc512f8306
parent 176e9bd5120737c6fc414c4576919e0784fc6826
parent 8c40fc4d15341f16a11167ac7656e481a2265a4c
author Richard Eckart de Castilho <rec@apache.org> 1604481420 +0100
committer Richard Eckart de Castilho <rec@apache.org> 1604481420 +0100

Merge branch 'master' into feature/UIMA-6291-Improve-uimaFIT-benchmarking-module

* master:
  [UIMA-6270] Add selectOverlapping to (J)CasUtil
  [UIMA-6270] Add selectOverlapping to (J)CasUtil
  [UIMA-6292] selectCovering is slow

% Conflicts:
%	uimafit-benchmark/src/test/java/org/apache/uima/fit/benchmark/CasUtilBenchmark.java
%	uimafit-benchmark/src/test/java/org/apache/uima/fit/benchmark/JCasUtilBenchmark.java