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

Set ping version even on error #33827

Merged
merged 1 commit into from Jun 29, 2017

Conversation

Projects
None yet
6 participants
@cpuguy83
Contributor

cpuguy83 commented Jun 26, 2017

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.

@thaJeztah

changes LGTM, but left a suggestion for adding a bit more context to the tests

Show outdated Hide outdated client/ping_test.go
@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Jun 27, 2017

Contributor

Related to docker/cli#149

Contributor

aaronlehmann commented Jun 27, 2017

Related to docker/cli#149

@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Jun 28, 2017

Contributor

LGTM

Contributor

aaronlehmann commented Jun 28, 2017

LGTM

@boaz1337

LGTM 👍

@thaJeztah

LGTM, but left a suggestion - let me know if you want to address that in this PR or as a follow up

Show outdated Hide outdated client/ping.go
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>
@thaJeztah

LGTM, thanks!

@thaJeztah thaJeztah merged commit 654bb63 into moby:master Jun 29, 2017

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 35382 has succeeded
Details
janky Jenkins build Docker-PRs 43993 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 4360 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 15327 has succeeded
Details
z Jenkins build Docker-PRs-s390x 4074 has succeeded
Details

thaJeztah added a commit to thaJeztah/cli that referenced this pull request Jul 2, 2017

Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away moby/moby#33798 (related to docker#236)
- Update go-connections dependency moby/moby#33814 (already vendored in docker#238)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah added a commit to thaJeztah/cli that referenced this pull request Jul 2, 2017

Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Add a LastTagTime for images (moby/moby#31497)
- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away (moby/moby#33798) (related to docker#236)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah added a commit to thaJeztah/cli that referenced this pull request Jul 3, 2017

Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Add a LastTagTime for images (moby/moby#31497)
- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away (moby/moby#33798) (related to docker#236)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah added a commit to thaJeztah/cli that referenced this pull request Jul 5, 2017

Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Add a LastTagTime for images (moby/moby#31497)
- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away (moby/moby#33798) (related to docker#236)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

@cpuguy83 cpuguy83 deleted the cpuguy83:return_ping_data_if_available branch Jul 10, 2017

andrewhsu pushed a commit to docker/docker-ce that referenced this pull request Jul 14, 2017

Bump moby to 87df0e5
Includes changes from;

- Add a LastTagTime for images (moby/moby#31497)
- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away (moby/moby#33798) (related to docker/cli#236)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 366d3ec971d8007c667e8d7dc8e35a346fb19539
Component: cli

alshabib added a commit to alshabib/cli that referenced this pull request Aug 1, 2017

Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Add a LastTagTime for images (moby/moby#31497)
- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away (moby/moby#33798) (related to docker#236)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment