Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Update native-docker.md #1076

Merged
merged 3 commits into from
Jan 23, 2015
Merged

Update native-docker.md #1076

merged 3 commits into from
Jan 23, 2015

Conversation

gomes
Copy link
Contributor

@gomes gomes commented Jan 22, 2015

Fix a comma after the command line option url.

Fix a comma after the command line option url.
@lingmann
Copy link
Contributor

Thanks @gomes! Do you mind wrapping so line length matches the rest of the file?

Wrapping, so the line length will matches the rest of the file
@gomes
Copy link
Contributor Author

gomes commented Jan 23, 2015

Done @lingmann ;)

@@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just merged a PR (#1079) that increases the timeout to 5 minutes. It might also be worth noting that the time unit for this option is ms, so 300000 means five minutes.

Inform that timeout has to be set in milliseconds
@gomes
Copy link
Contributor Author

gomes commented Jan 23, 2015

@ConnorDoyle I did a simple change to add it

@ConnorDoyle
Copy link
Contributor

Thanks!

ConnorDoyle added a commit that referenced this pull request Jan 23, 2015
@ConnorDoyle ConnorDoyle merged commit f7f9a00 into d2iq-archive:master Jan 23, 2015
@marcomonaco marcomonaco added the pr label Mar 6, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants