Repository: nifi Updated Branches: refs/heads/master b2ce6f1f9 -> 347b281b2
NIFI-1887 Updating default timeout in Admin Guide This closes #447. Signed-off-by: James Wing <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/347b281b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/347b281b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/347b281b Branch: refs/heads/master Commit: 347b281b2da7778fd658e3e5e81bab86c2df4b2c Parents: b2ce6f1 Author: James Wing <[email protected]> Authored: Mon May 16 10:50:20 2016 -0700 Committer: James Wing <[email protected]> Committed: Mon May 16 11:57:33 2016 -0700 ---------------------------------------------------------------------- nifi-docs/src/main/asciidoc/administration-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/347b281b/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 5b650b4..930130d 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -1125,7 +1125,7 @@ nifi.nar.library.directory.lib2=/nars/lib2 + Providing three total locations, including _nifi.nar.library.directory_. |nifi.nar.working.directory|The location of the nar working directory. The default value is ./work/nar and probably should be left as is. |nifi.documentation.working.directory|The documentation working directory. The default value is ./work/docs/components and probably should be left as is. -|nifi.processor.scheduling.timeout|Time to wait for a Processor's life-cycle operation (@OnScheduled and @OnUnscheduled) to finish before other life-cycle operation (e.g., stop) could be invoked. Default is infinite. +|nifi.processor.scheduling.timeout|Time to wait for a Processor's life-cycle operation (@OnScheduled and @OnUnscheduled) to finish before other life-cycle operation (e.g., stop) could be invoked. Default is 1 minute. |====
