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/6c4c9820 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/6c4c9820 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/6c4c9820 Branch: refs/heads/2.x Commit: 6c4c9820f882117a52efd45c9055ac7941aa0d1c Parents: 912798a 2a69db7 Author: tballison <[email protected]> Authored: Tue May 17 16:09:42 2016 -0400 Committer: tballison <[email protected]> Committed: Tue May 17 16:09:42 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/tika/detect/NameDetector.java | 15 ++++++++++----- .../org/apache/tika/detect/NameDetectorTest.java | 10 ++++++++++ .../java/org/apache/tika/mime/MimeDetectionTest.java | 8 +++++++- 3 files changed, 27 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
