Repository: nifi Updated Branches: refs/heads/master 26f46538b -> 6e7793305
NIFI-2731 MergeContent default max number of flow files and max number of bins should be smaller Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6e779330 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6e779330 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6e779330 Branch: refs/heads/master Commit: 6e7793305d4ebcf154cf42ae7f6e9e17cab4e857 Parents: 26f4653 Author: Pierre Villard <[email protected]> Authored: Tue Sep 27 21:09:51 2016 +0200 Committer: Mark Payne <[email protected]> Committed: Thu Oct 13 15:13:47 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/processor/util/bin/BinFiles.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/6e779330/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java index a93550d..ea64d87 100644 --- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java +++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java @@ -71,6 +71,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor { public static final PropertyDescriptor MAX_ENTRIES = new PropertyDescriptor.Builder() .name("Maximum Number of Entries") .description("The maximum number of files to include in a bundle. If not specified, there is no maximum.") + .defaultValue("1000") .required(false) .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR) .build(); @@ -78,7 +79,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor { public static final PropertyDescriptor MAX_BIN_COUNT = new PropertyDescriptor.Builder() .name("Maximum number of Bins") .description("Specifies the maximum number of bins that can be held in memory at any one time") - .defaultValue("100") + .defaultValue("5") .required(true) .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR) .build();
