Repository: nifi
Updated Branches:
  refs/heads/master 9750cf2fc -> 17718940d


NIFI-4689 - Ensuring all provenance properties are represented in 
nifi.properties.

Signed-off-by: Pierre Villard <[email protected]>

This closes #2352.


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

Branch: refs/heads/master
Commit: 17718940d7e5aaa2ec8682c6aedd03736ec4a0b6
Parents: 9750cf2
Author: Matt Gilman <[email protected]>
Authored: Mon Dec 18 15:42:45 2017 -0500
Committer: Pierre Villard <[email protected]>
Committed: Tue Dec 19 09:44:25 2017 +0100

----------------------------------------------------------------------
 .../nifi-resources/src/main/resources/conf/nifi.properties         | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/17718940/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
index 19358f6..f6a1ed5 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
@@ -109,6 +109,8 @@ 
nifi.provenance.repository.index.shard.size=${nifi.provenance.repository.index.s
 # Indicates the maximum length that a FlowFile attribute can be when 
retrieving a Provenance Event from
 # the repository. If the length of any attribute exceeds this value, it will 
be truncated when the event is retrieved.
 
nifi.provenance.repository.max.attribute.length=${nifi.provenance.repository.max.attribute.length}
+nifi.provenance.repository.concurrent.merge.threads=${nifi.provenance.repository.concurrent.merge.threads}
+nifi.provenance.repository.warm.cache.frequency=${nifi.provenance.repository.warm.cache.frequency}
 
 # Volatile Provenance Respository Properties
 
nifi.provenance.repository.buffer.size=${nifi.provenance.repository.buffer.size}

Reply via email to