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:35:49 UTC
[tika] branch gsoc17 updated (0e1abd2 -> 79f4b4e)
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a change to branch gsoc17
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 0e1abd2 Merge branch 'TIKA-2355' of https://github.com/smadha/tika into gsoc17
add 0f57ea8 Merge branch 'TIKA-2355' of https://github.com/smadha/tika
add c6b6b17 record changes for TIKA-2265.
new 79f4b4e fix conflicts in CHANGES.txt during merge
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 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].
[tika] 01/01: fix conflicts in CHANGES.txt during merge
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch gsoc17
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 79f4b4e3883e53f54c9116aedd44cab1a13c8b3c
Merge: 0e1abd2 c6b6b17
Author: Chris Mattmann <ma...@apache.org>
AuthorDate: Fri Sep 1 13:35:34 2017 -0700
fix conflicts in CHANGES.txt during merge
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc CHANGES.txt
index c826bab,ccbdfe9..06751a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,7 -9,7 +9,7 @@@ Release 1.17 - ??
* Tika now has support for automatic image captioning, that
combines Computer Vision and Natural Language Processing to
automatically generate a readable caption for an image
- (TIKA-2262, TIKA-2402, Gh-198, Gh-196, Gh-189).
- (TIKA-2262, TIKA-2355).
++ (TIKA-2262, TIKA-2355, TIKA-2402, Gh-198, Gh-196, Gh-189).
* Add TestCorruptedFiles to allow devs to test parsers against
corrupted input files (TIKA-2430).
--
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.