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

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 5f7e06f904eb34dc256678e905b3fa0cf8eaf076
Author: Adam Debreceni <[email protected]>
AuthorDate: Fri Jun 30 07:35:05 2023 +0200

    MINIFICPP-2153 Change default merge algorithm
    
    Closes #1597
    Signed-off-by: Marton Szasz <[email protected]>
---
 extensions/libarchive/BinFilesStaticDefinitions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/libarchive/BinFilesStaticDefinitions.cpp 
b/extensions/libarchive/BinFilesStaticDefinitions.cpp
index 7cc6d03bd..e0432b432 100644
--- a/extensions/libarchive/BinFilesStaticDefinitions.cpp
+++ b/extensions/libarchive/BinFilesStaticDefinitions.cpp
@@ -68,7 +68,7 @@ const core::Property MergeContent::MergeStrategy(
   core::PropertyBuilder::createProperty("Merge Strategy")
   ->withDescription("Defragment or Bin-Packing Algorithm")
   
->withAllowableValues<std::string>({merge_content_options::MERGE_STRATEGY_DEFRAGMENT,
 merge_content_options::MERGE_STRATEGY_BIN_PACK})
-  
->withDefaultValue(merge_content_options::MERGE_STRATEGY_DEFRAGMENT)->build());
+  ->withDefaultValue(merge_content_options::MERGE_STRATEGY_BIN_PACK)->build());
 const core::Property MergeContent::MergeFormat(
   core::PropertyBuilder::createProperty("Merge Format")
   ->withDescription("Merge Format")

Reply via email to