fix pre-1.21 docker stats #17549
Merged
fix pre-1.21 docker stats #17549
Conversation
This file contains hidden or 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
This fixes a bug introduced in moby#15786: * if a pre-v1.20 client requested docker stats, the daemon would return both an API-compatible JSON blob *and* an API-incompatible JSON blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629 Signed-off-by: Donald Huang <don.hcd@gmail.com>
147e2d1 to
d2c04f8
Compare
Contributor
|
can we have tests to make sure we're returning the right structs in https://github.com/docker/docker/blob/master/integration-cli/docker_api_stats_test.go ? |
Contributor
|
Changes look good to me, but we need to make sure this is the right behavior. |
Contributor
Author
There was a problem hiding this comment.
this code already exists below on line 114 (in the new version)
Contributor
|
LGTM |
1 similar comment
Contributor
|
LGTM |
donhcd
added a commit
to donhcd/docker
that referenced
this pull request
Oct 31, 2015
testing for moby#17549 Signed-off-by: Donald Huang <don.hcd@gmail.com>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This fixes a bug introduced in #15786:
would return both an API-compatible JSON blob and an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629
Signed-off-by: Donald Huang don.hcd@gmail.com