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 2021/12/03 23:25:47 UTC

[tika] 02/02: Merge remote-tracking branch 'origin/main' into main

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

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

commit 71f7e50cbd8d18a2bf269e240593e4a398b9f8ee
Merge: cace0ca 26976b6
Author: tallison <ta...@apache.org>
AuthorDate: Fri Dec 3 18:25:15 2021 -0500

    Merge remote-tracking branch 'origin/main' into main
    
    # Conflicts:
    #	CHANGES.txt

 CHANGES.txt                                        |   3 +
 .../java/org/apache/tika/pipes/PipesServer.java    |   2 +-
 .../apache/tika/server/standard/TikaPipesTest.java | 216 +++++++++++++++++++++
 3 files changed, 220 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 7348acc,3d2e248..21f09c3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,8 +1,11 @@@
  Release 2.2.0 - ???
  
+    * Fix logic bug in PipesServer that prevented concatenation of
+      content from attachments (TIKA-3609).
+ 
 +   * Improve extraction of embedded files from MSOffice files created
 +     by non-Microsoft tools (TIKA-3526).
 +
     * Added back ability to ignore load errors in TikaConfig (TIKA-3575).
  
     * Make SecureContentHandler and other parameters configurable in