nifi git commit: NIFI-3090 Added new flow election cluster properties to Admin Guide property tables

[bb...@apache.org]

Repository: nifi
Updated Branches:
  refs/heads/master d701cd836 -> 32e1603bd


NIFI-3090 Added new flow election cluster properties to Admin Guide property tables

This closes #1313.

Signed-off-by: Bryan Bende <bb...@apache.org>


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

Branch: refs/heads/master
Commit: 32e1603bd6950c13727dc596d09ae150676eeba7
Parents: d701cd8
Author: Andrew Lim <an...@gmail.com>
Authored: Fri Dec 9 11:33:15 2016 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Mon Dec 12 09:30:38 2016 -0500

----------------------------------------------------------------------
 nifi-docs/src/main/asciidoc/administration-guide.adoc | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/32e1603b/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index ccbd471..2835576 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -2218,6 +2218,8 @@ the connection a failure. The default value is _5 secs_.
 from the remote node before considering the communication with the node a failure. The default value is _5 secs_.
 |nifi.cluster.firewall.file|The location of the node firewall file. This is a file that may be used to list all the nodes that are allowed to connect
 to the cluster. It provides an additional layer of security. This value is blank by default, meaning that no firewall file is to be used.
+|nifi.cluster.flow.election.max.wait.time|Specifies the amount of time to wait before electing a Flow as the "correct" Flow. If the number of Nodes that have voted is equal to the number specified by the `nifi.cluster.flow.election.max.candidates` property, the cluster will not wait this long. The default is _5 min_. Note that the time starts as soon as the first vote is cast.
+|nifi.cluster.flow.election.max.candidates|Specifies the number of Nodes required in the cluster to cause early election of Flows. This allows the Nodes in the cluster to avoid having to wait a long time before starting processing if we reach at least this number of nodes in the cluster.
 |====
 
 [[claim_management]]