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

[17.06.1] Swagger and API docs cherry-picks #132

Merged
merged 7 commits into from
Jul 25, 2017
Merged

[17.06.1] Swagger and API docs cherry-picks #132

merged 7 commits into from
Jul 25, 2017

Conversation

thaJeztah
Copy link
Member

Cherry-picks of:

ping @aaronlehmann @andrewhsu @tiborvass PTAL

gesellix and others added 7 commits July 25, 2017 02:16
@gesellix @thaJeztah
Fix typo in swagger doc
82dc930 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
(cherry picked from commit 56da4f2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Service privileges: API docs
e0fe1f5 
This documents the Service privileges
API changes, that were added in:
091b5e6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d0a8e73)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@allencloud @thaJeztah
add cluster events details in swagger.yml
9ec7c03 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit f596fb7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@allencloud @thaJeztah
add cluster events change in version_history.md
8e88731 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit e9da15a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Fix API docs for GET /secrets/{id}, GET /secrets
f30bfbf 
The swagger.yml defined these endpoints to return
a "ServiceSpec" instead of a "SecretSpec".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f6954be)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@aaronlehmann @thaJeztah
api: Update swagger.yaml for configs
7b48a27 
Also fix bad reference to ServiceSpec.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit ea1d14a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Improve API docs for UsageData
513bac3 
The docs did not mention when this information
was set, and what the `-1` value indicated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 194f635)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@vieux
Copy link
Contributor

vieux commented Jul 25, 2017

LGTM

@vieux vieux added this to the 17.06.1 milestone Jul 25, 2017
@tiborvass
Copy link
Contributor

LGTM

@vieux vieux merged commit 627ef8c into docker-archive:17.06 Jul 25, 2017
@thaJeztah thaJeztah deleted the docs-cherry-picks branch July 25, 2017 22:34
@andrewhsu andrewhsu mentioned this pull request Aug 2, 2017
Merged
docker-jenkins pushed a commit that referenced this pull request Dec 13, 2018
@andrewhsu
Merge pull request #132 from thaJeztah/18.09_backport_idprefix
fbe190c 
[18.09 backport] fixes display text in Multiple IDs found with provided prefix
Upstream-commit: a8572d3e8e1e3f738d6e9bc3bf0f137d64bab616
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
@vieux
Merge pull request docker-archive#132 from thaJeztah/docs-cherry-picks
fa87f7d 
[17.06.1] Swagger and API docs cherry-picks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mdlinville mdlinville mdlinville approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17.06.1
Development

Successfully merging this pull request may close these issues.
7 participants
@thaJeztah @vieux @tiborvass @mdlinville @gesellix @allencloud @aaronlehmann