This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 869e22192a4868eca8f81e239dc4b4e502e0b989
Author: gyao <g...@data-artisans.com>
AuthorDate: Thu Aug 9 13:34:46 2018 +0200
[hotfix][docs] Add missing space after end of sentence.
---
docs/_includes/generated/job_manager_configuration.html | 2 +-
.../org/apache/flink/configuration/JobManagerOptions.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/docs/_includes/generated/job_manager_configuration.html
b/docs/_includes/generated/job_manager_configuration.html
index 0353874..0458af2 100644
--- a/docs/_includes/generated/job_manager_configuration.html
+++ b/docs/_includes/generated/job_manager_configuration.html
@@ -20,7 +20,7 @@
<tr>
<td><h5>jobmanager.execution.failover-strategy</h5></td>
<td style="word-wrap: break-word;">"full"</td>
- <td>The maximum number of prior execution attempts kept in
history.</td>
+ <td>This option specifies how the job computation recovers from
task failures. Accepted values are:<ul><li>'full': Restarts all
tasks.</li><li>'individual': Restarts only the failed task. Should only be used
if all tasks are independent components.</li><li>'region': Restarts all tasks
that could be affected by the task failure.</li></ul></td>
</tr>
<tr>
<td><h5>jobmanager.heap.size</h5></td>
diff --git
a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
index 2bb5732..e845d60 100644
---
a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
+++
b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java
@@ -20,8 +20,10 @@ package org.apache.flink.configuration;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.annotation.docs.Documentation;
+import org.apache.flink.configuration.description.Description;
import static org.apache.flink.configuration.ConfigOptions.key;
+import static org.apache.flink.configuration.description.TextElement.text;
/**
* Configuration options for the JobManager.
@@ -107,7 +109,14 @@ public class JobManagerOptions {
public static final ConfigOption<String> EXECUTION_FAILOVER_STRATEGY =
key("jobmanager.execution.failover-strategy")
.defaultValue("full")
- .withDescription("The maximum number of prior execution
attempts kept in history.");
+ .withDescription(Description.builder()
+ .text("This option specifies how the job
computation recovers from task failures. " +
+ "Accepted values are:")
+ .list(
+ text("'full': Restarts all tasks."),
+ text("'individual': Restarts only the
failed task. Should only be used if all tasks are independent components."),
+ text("'region': Restarts all tasks that
could be affected by the task failure.")
+ ).build());
/**
* This option specifies the interval in order to trigger a resource
manager reconnection if the connection
