You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/07/08 18:21:36 UTC

[2/2] tika git commit: Merge remote-tracking branch 'origin/2.x' into 2.x

Merge remote-tracking branch 'origin/2.x' into 2.x


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/cdfacdb4
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/cdfacdb4
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/cdfacdb4

Branch: refs/heads/2.x
Commit: cdfacdb4186a7a113f0c518df1ed94bcc16ff252
Parents: 87e1e23 573527b
Author: tballison <ta...@mitre.org>
Authored: Fri Jul 8 14:21:30 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Jul 8 14:21:30 2016 -0400

----------------------------------------------------------------------
 .../apache/tika/parser/geo/topic/GeoParser.java | 43 +++++++++++---------
 .../tika/parser/geo/topic/GeoParserConfig.java  |  4 +-
 .../apache/tika/parser/geo/topic/GeoTag.java    | 33 +++++++--------
 .../parser/geo/topic/NameEntityExtractor.java   | 11 ++---
 4 files changed, 48 insertions(+), 43 deletions(-)
----------------------------------------------------------------------