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

[17.06] Set ping version even on error #115

Merged
merged 2 commits into from Jul 13, 2017

Conversation

Projects
None yet
3 participants
@andrewhsu
Collaborator

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 some commits Jun 26, 2017

Set ping version even on error
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 <cpuguy83@gmail.com>
(cherry picked from commit 27ef09a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
vendor prev git commit 10aa812 into components/cli
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 <andrewhsu@docker.com>

@andrewhsu andrewhsu added this to the 17.06.1 milestone Jul 13, 2017

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu
Collaborator

andrewhsu commented Jul 13, 2017

@thaJeztah

LGTM

@cpuguy83

LGTM

@andrewhsu andrewhsu merged commit 1d1b9ad into docker:17.06 Jul 13, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 178 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 172 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:set-ping-ver branch Jul 13, 2017

docker-jenkins pushed a commit that referenced this pull request Jun 29, 2018

Merge pull request #115 from seemethere/remove
Remove Debian Jessie for arm64
Upstream-commit: 4f79760ebf3d659be670d5079574b3fc199f14a0
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment