You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2017/09/01 20:36:20 UTC

[tika] branch master updated (e41c129 -> 5b57ae4)

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

mattmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.


    from e41c129  Duh...further refinement on PR-201
     add e2f5b17  TIKA 2402 : Include pillow  + include logic to convert non jpeg image
     add 523f5d6  TIKA 2402 : Minor changes in client & config + Include png, gif tests
     add fe7533d  TIKA 2402 : Minor fix in dockerfile
     add 1941a29  Record changes related to Image Captioning.
     add b422eda  Merge branch 'master' into gsoc17
     add a288bce  Merge branch 'master' into gsoc17
     add 0e1abd2  Merge branch 'TIKA-2355' of https://github.com/smadha/tika into gsoc17
     add 79f4b4e  fix conflicts in CHANGES.txt during merge
     new 5b57ae4  Merge branch 'gsoc17'

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:
 CHANGES.txt                                        |  2 +-
 .../recognition/tf/TensorflowRESTRecogniser.java   | 12 +++++++-
 .../parser/recognition/tf/InceptionRestDockerfile  |  4 +--
 .../tika/parser/recognition/tf/inceptionapi.py     | 29 ++++++++++++++----
 .../recognition/ObjectRecognitionParserTest.java   | 35 ++++++++++++++++++++++
 .../parser/recognition/tika-config-tflow-rest.xml  |  2 ++
 6 files changed, 75 insertions(+), 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].

[tika] 01/01: Merge branch 'gsoc17'

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 5b57ae4d5218ec7af6388c6d5d51984566fc2511
Merge: e41c129 79f4b4e
Author: Chris Mattmann <ma...@apache.org>
AuthorDate: Fri Sep 1 13:36:06 2017 -0700

    Merge branch 'gsoc17'

 CHANGES.txt                                        |  2 +-
 .../recognition/tf/TensorflowRESTRecogniser.java   | 12 +++++++-
 .../parser/recognition/tf/InceptionRestDockerfile  |  4 +--
 .../tika/parser/recognition/tf/inceptionapi.py     | 29 ++++++++++++++----
 .../recognition/ObjectRecognitionParserTest.java   | 35 ++++++++++++++++++++++
 .../parser/recognition/tika-config-tflow-rest.xml  |  2 ++
 6 files changed, 75 insertions(+), 9 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.