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

[17.06] Set ping version even on error #115

Merged
merged 2 commits into from
Jul 13, 2017
Merged

[17.06] Set ping version even on error #115

merged 2 commits into from
Jul 13, 2017

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jul 13, 2017

Backport fix:

With cherry-pick moby/moby@27ef09a:

$ git cherry-pick -s -x -Xsubtree=components/engine 27ef09a

No conflicts.

And copy of cherry-picked files to vendor of cli component:

$ cp components/engine/client/ping.go \
  components/cli/vendor/github.com/docker/docker/client/ping.go
$ cp components/engine/client/request.go \
  components/cli/vendor/github.com/docker/docker/client/request.go

cpuguy83 and others added 2 commits July 13, 2017 03:55
In some cases a server may return an error on the ping response but
still provide version details. The client should use these values when
available.

Signed-off-by: Brian Goff <[email protected]>
(cherry picked from commit 27ef09a)
Signed-off-by: Andrew Hsu <[email protected]>
Originally from commit titled: Set ping version even on error
which was cherry picked from upstream commit 27ef09a of component engine.

Signed-off-by: Andrew Hsu <[email protected]>
@andrewhsu andrewhsu added this to the 17.06.1 milestone Jul 13, 2017
@andrewhsu
Copy link
Contributor Author

@thaJeztah @cpuguy83

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 1d1b9ad into docker-archive:17.06 Jul 13, 2017
@andrewhsu andrewhsu deleted the set-ping-ver branch July 13, 2017 18:59
docker-jenkins pushed a commit that referenced this pull request Jun 29, 2018
Remove Debian Jessie for arm64
Upstream-commit: 4f79760
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants