Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make docker service --help text for --endpoint-mode more consistent #24330

Merged
merged 1 commit into from
Jul 7, 2016
Merged

make docker service --help text for --endpoint-mode more consistent #24330

merged 1 commit into from
Jul 7, 2016

Conversation

avsm
Copy link
Contributor

@avsm avsm commented Jul 5, 2016

Previously:

      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode(Valid values: vip, dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)

Now:

      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode (vip or dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)

Signed-off-by: Anil Madhavapeddy anil@docker.com

@dnephin dnephin added this to the 1.12.0 milestone Jul 5, 2016
@dnephin
Copy link
Member

dnephin commented Jul 5, 2016

LGTM (IANAM)

@vdemeester
Copy link
Member

LGTM 🐯

@LK4D4
Copy link
Contributor

LK4D4 commented Jul 5, 2016

@avsm Could you, also, change docs/reference/commandline/service_create.md and docs/reference/commandline/service_update.md, pls.

@icecrime
Copy link
Contributor

icecrime commented Jul 5, 2016

LGTM with @LK4D4 comment above! Thanks

@thaJeztah thaJeztah mentioned this pull request Jul 6, 2016
Closed
@avsm
make docker service --help text for --endpoint-mode more consistent
2de9585 
Previously:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode(Valid values: vip, dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Now:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode (vip or dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
@avsm
Copy link
Contributor Author

avsm commented Jul 6, 2016

@LK4D4 pushed the doc sync as well

@thaJeztah
Copy link
Member

retest this please

@thaJeztah
Copy link
Member

docs LGTM

@thaJeztah thaJeztah merged commit f85a231 into moby:master Jul 7, 2016
@avsm avsm deleted the endpoint-cli-typo branch July 7, 2016 11:08
@tiborvass tiborvass mentioned this pull request Jul 8, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/cli area/swarm process/cherry-picked status/4-merge
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@avsm @dnephin @vdemeester @LK4D4 @icecrime @thaJeztah @tiborvass @GordonTheTurtle