| commit | fe82a17571fd3bd79a37ffad29f7405c301ed28e | [log] [tgz] |
|---|---|---|
| author | Richard Eckart de Castilho <rec@apache.org> | Tue Mar 24 11:37:11 2020 +0100 |
| committer | Richard Eckart de Castilho <rec@apache.org> | Tue Mar 24 11:37:11 2020 +0100 |
| tree | a488cdfda89a0f243cecce0ed6ac5fdfbca8a0c9 | |
| parent | b21df4e56267c6bc0ecf8ff9061891d148205776 [diff] | |
| parent | a90e93452d9c34850fa5333dc8c512dc3f5ed416 [diff] |
Merge branch 'master-v2' * master-v2: [UIMA-6207] Allow setting number of threads in CpePipeline [UIMA-6206] Parameter values with certain non-XML 1.0 characters not supported [UIMA-6204] createReaderDescription does not discover type priorities # Conflicts: # uimafit-core/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java # uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/CpePipeline.java