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

Posted to commits@uima.apache.org by sc...@apache.org on 2020/01/08 19:27:34 UTC

[uima-uimaj] branch master updated (4002169 -> 387b047)

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

schor pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


    from 4002169  Merge pull request #16 from apache/bugfix/UIMA-6162-Concurrent-binary-serialization-produces-corrupt-output
     add 17f6dfd  add testcase temp file to .gitignore
     add 9d1ad83  [UIMA-6159] add method signatures for FeatureStructure
     new 387b047  Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/uima/cas/SelectFSs.java   | 105 ++++++++++++++++++++-
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |  60 +++++++++++-
 uimaj-cpe/.gitignore                               |   3 +
 uimaj-parent/pom.xml                               |   2 +-
 4 files changed, 161 insertions(+), 9 deletions(-)
 create mode 100644 uimaj-cpe/.gitignore

[uima-uimaj] 01/01: Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP

Posted by sc...@apache.org.

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

schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 387b04731cd3af4a5a3d24ecd457381b4fa78eea
Merge: 4002169 9d1ad83
Author: mischor <ms...@schor.com>
AuthorDate: Wed Jan 8 14:27:25 2020 -0500

    Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP
    
    Uima 6159 select fs allow annotation fs in addition to top

 .../main/java/org/apache/uima/cas/SelectFSs.java   | 105 ++++++++++++++++++++-
 .../org/apache/uima/cas/impl/SelectFSs_impl.java   |  60 +++++++++++-
 uimaj-cpe/.gitignore                               |   3 +
 uimaj-parent/pom.xml                               |   2 +-
 4 files changed, 161 insertions(+), 9 deletions(-)