From d42ff12e7297c8c229921e542e1d65d35014e900 Mon Sep 17 00:00:00 2001 From: Diogo Gomes Date: Thu, 22 Jan 2015 13:36:07 -0200 Subject: [PATCH 1/3] Update native-docker.md Fix a comma after the command line option url. --- docs/docs/native-docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/native-docker.md b/docs/docs/native-docker.md index 99f4e100a4b..1536ef5cb35 100644 --- a/docs/docs/native-docker.md +++ b/docs/docs/native-docker.md @@ -44,7 +44,7 @@ Docker version 1.0.0 or later installed on each slave node. ### Configure marathon -1. Increase the marathon [command line option]({{ site.baseurl }}/docs/command-line-flags.html") `--task_launch_timeout` to at least the executor timeout you set on your slaves in the previous step. +1. Increase the marathon [command line option]({{ site.baseurl }}/docs/command-line-flags.html) `--task_launch_timeout` to at least the executor timeout you set on your slaves in the previous step. ### Resources From 2fa6f959888f3f6c575529a60abb8c45e17f2c90 Mon Sep 17 00:00:00 2001 From: Diogo Gomes Date: Thu, 22 Jan 2015 22:31:48 -0200 Subject: [PATCH 2/3] Update native-docker.md Wrapping, so the line length will matches the rest of the file --- docs/docs/native-docker.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/docs/native-docker.md b/docs/docs/native-docker.md index 1536ef5cb35..d46e7aa8b97 100644 --- a/docs/docs/native-docker.md +++ b/docs/docs/native-docker.md @@ -44,7 +44,8 @@ Docker version 1.0.0 or later installed on each slave node. ### Configure marathon -1. Increase the marathon [command line option]({{ site.baseurl }}/docs/command-line-flags.html) `--task_launch_timeout` to at least the executor timeout you set on your slaves in the previous step. +1. Increase the marathon [command line option]({{ site.baseurl }}/docs/command-line-flags.html) +`--task_launch_timeout` to at least the executor timeout you set on your slaves in the previous step. ### Resources From 7585b13f18ab39ed7c48f30897b0a31aa1846095 Mon Sep 17 00:00:00 2001 From: Diogo Gomes Date: Thu, 22 Jan 2015 23:54:17 -0200 Subject: [PATCH 3/3] Update native-docker.md Inform that timeout has to be set in milliseconds --- docs/docs/native-docker.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/docs/native-docker.md b/docs/docs/native-docker.md index d46e7aa8b97..a91a61c2a94 100644 --- a/docs/docs/native-docker.md +++ b/docs/docs/native-docker.md @@ -45,7 +45,8 @@ Docker version 1.0.0 or later installed on each slave node. ### Configure marathon 1. Increase the marathon [command line option]({{ site.baseurl }}/docs/command-line-flags.html) -`--task_launch_timeout` to at least the executor timeout you set on your slaves in the previous step. +`--task_launch_timeout` to at least the executor timeout, in milliseconds, +you set on your slaves in the previous step. ### Resources