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.
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
add force remove to admin guide, clean up usage of Raft, cluster -> s… #25457
Merged
vdemeester
merged 1 commit into
moby:master
from
sfsmithcha:add_force_remove_to_admin_guide
Aug 6, 2016
Merged
add force remove to admin guide, clean up usage of Raft, cluster -> s… #25457
vdemeester
merged 1 commit into
moby:master
from
sfsmithcha:add_force_remove_to_admin_guide
Aug 6, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sfsmithcha
force-pushed
the
add_force_remove_to_admin_guide
branch
from
August 5, 2016 23:43
b4addf2
to
c58fe42
Compare
and removals. Membership operations are subject to the same constraints as state | ||
replication. | ||
|
||
## Use a static IP for manager node advertise address | ||
|
||
When initiating a swarm, you have to specify the `--listen-addr` flag to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
--listen-addr
-> --advertise-addr
Left two small comments but LGTM after fixing. |
…warm, fix some organization Signed-off-by: Charles Smith <charles.smith@docker.com>
sfsmithcha
force-pushed
the
add_force_remove_to_admin_guide
branch
from
August 6, 2016 00:27
c58fe42
to
6c38e68
Compare
LGTM 🐮 |
SvenDowideit
pushed a commit
to SvenDowideit/docker
that referenced
this pull request
Aug 10, 2016
…in_guide add force remove to admin guide, clean up usage of Raft, cluster -> s… (cherry picked from commit 59b0324) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> Conflicts: docs/swarm/admin_guide.md
currently in #25581 |
SvenDowideit
added
process/docs-cherry-picked
and removed
process/docs-cherry-pick
labels
Aug 11, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
Adds information on force removing a node to the admin guide. See #25159
Fixes usage of cluster > swarm. Manager/Worker > manager/worker. raft > Raft .
Fix some organization.
- How I did it
Edit admin_guide.md
- How to verify it
Verify text for accuracy/correctness.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
Signed-off-by: Charles Smith charles.smith@docker.com