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.

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
merged 1 commit into from Aug 6, 2016

Conversation

sfsmithcha
Copy link
Contributor

@sfsmithcha sfsmithcha commented Aug 5, 2016

- 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

@sfsmithcha sfsmithcha added this to the 1.12.1 milestone Aug 5, 2016
@sfsmithcha sfsmithcha force-pushed the add_force_remove_to_admin_guide branch from b4addf2 to c58fe42 Compare August 5, 2016 23:43
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
Copy link
Contributor

Choose a reason for hiding this comment

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

--listen-addr -> --advertise-addr

@abronan
Copy link
Contributor

abronan commented Aug 6, 2016

Left two small comments but LGTM after fixing.

…warm, fix some organization

Signed-off-by: Charles Smith <charles.smith@docker.com>
@vdemeester
Copy link
Member

LGTM 🐮
/cc @thaJeztah

@vdemeester vdemeester merged commit 59b0324 into moby:master Aug 6, 2016
@sfsmithcha sfsmithcha deleted the add_force_remove_to_admin_guide branch August 8, 2016 17:36
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
@SvenDowideit
Copy link
Contributor

currently in #25581

tiborvass pushed a commit to tiborvass/docker that referenced this pull request Aug 11, 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

(cherry picked from commit 0f65b6b)
Signed-off-by: Tibor Vass <tibor@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants