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

[17.03.x] Docs cherry picks #31474

Merged
merged 5 commits into from
Mar 2, 2017
Merged

[17.03.x] Docs cherry picks #31474

merged 5 commits into from
Mar 2, 2017

Conversation

thaJeztah
Copy link
Member

Cherry-picking;

#30731 (8d28fc8)
#30832 (e8b92f1)
#31291 (27c9a6e)
#31398 (fb5ccc6)
#31467 (9321a12)

ping @vdemeester @mstanleyjones PTAL

thaJeztah and others added 5 commits March 2, 2017 11:03
@thaJeztah
Merge pull request moby#30731 from shin-/plugin_privileges_param_fix
4b025d0 
Parameter name in GetPluginPrivileges is "remote"
(cherry picked from commit 8d28fc8)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@vdemeester @thaJeztah
Merge pull request moby#30832 from allencloud/update-swaggeryml-on-cl…
05b81bc 
…uster-status-code

remove 400 and 404 for get nodes endpoint and add 503 for secret update
(cherry picked from commit e8b92f1)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@cpuguy83 @thaJeztah
Merge pull request moby#31291 from albers/docs-daemon-hosts
ef658fa 
Clarify why `hosts` in `daemon.json` does not work
(cherry picked from commit 27c9a6e)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Merge pull request moby#31398 from pjaffe/patch-1
9f55f97 
Remove incorrect duplicate phrase from build.md
(cherry picked from commit fb5ccc6)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Merge pull request moby#31467 from thaJeztah/remove-jekyll-markers
de692b1 
remove Jekyll tags from CLI reference
(cherry picked from commit 9321a12)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 17.03.0 milestone Mar 2, 2017
vdemeester
vdemeester approved these changes Mar 2, 2017
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐸

@vieux
Copy link
Contributor

vieux commented Mar 2, 2017

LGTM

@thaJeztah
Copy link
Member Author

LOL, what are the chances?

11:13:16 ----------------------------------------------------------------------
11:13:16 FAIL: docker_cli_secret_create_test.go:55: DockerSwarmSuite.TestSecretCreateResolve
11:13:16 
11:13:16 [dc1550f165a0f] waiting for daemon to start
11:13:16 [dc1550f165a0f] daemon started
11:13:16 docker_cli_secret_create_test.go:86:
11:13:16     c.Assert(out, checker.Not(checker.Contains), name)
11:13:16 ... obtained string = "" +
11:13:16 ...     "ID                          NAME                        CREATED                  UPDATED\n" +
11:13:16 ...     "2d32d0j1foonh0nvdjg8dr2gd   vomwk5g8qv97fjrmds4h8ub5j   Less than a second ago   Less than a second ago\n"
11:13:16 ... substring string = "foo"
11:13:16 
11:13:16 [dc1550f165a0f] exiting daemon

2d32d0j1foonh0nvdjg8dr2gd, yup, that contains foo 😂

@thaJeztah
Copy link
Member Author

anyway, not related, so merging 😄

@thaJeztah thaJeztah merged commit b2cba28 into moby:17.03.x Mar 2, 2017
@thaJeztah thaJeztah deleted the docs-cherry-picks branch March 2, 2017 12:11
@tiborvass tiborvass mentioned this pull request Mar 15, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

Assignees
No one assigned
Labels
status/4-merge
Projects
None yet
Milestone
17.03.0
Development

Successfully merging this pull request may close these issues.
5 participants
@thaJeztah @vieux @vdemeester @GordonTheTurtle @cpuguy83