Skip to content
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

UPSTREAM: 44068: Use Docker API Version instead of docker version #14158

Merged
merged 3 commits into from
May 21, 2017

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented May 12, 2017

Fixes #13281 but builds on top of #14121 which fixes godeps, so that needs to land first when queue opens next week, so only 3 last commits count.

@derekwaynecarr ptal

@soltysh
Copy link
Contributor Author

soltysh commented May 12, 2017

[test]

@soltysh
Copy link
Contributor Author

soltysh commented May 12, 2017

Flake #14161
[test]

@soltysh
Copy link
Contributor Author

soltysh commented May 12, 2017

Flake #14161
[test]

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 15, 2017
@soltysh soltysh removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 18, 2017
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 7ace3ae

@derekwaynecarr
Copy link
Member

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1555/) (Base Commit: eb0b1b8)

@soltysh
Copy link
Contributor Author

soltysh commented May 20, 2017

Flake #13693
[merge]

@soltysh
Copy link
Contributor Author

soltysh commented May 21, 2017

Flake: #10773
[merge]

@soltysh
Copy link
Contributor Author

soltysh commented May 21, 2017

Flake: #11016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 7ace3ae

@openshift-bot
Copy link
Contributor

openshift-bot commented May 21, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/735/) (Base Commit: dd853ce) (Image: devenv-rhel7_6247)

@openshift-bot openshift-bot merged commit 3410928 into openshift:master May 21, 2017
@soltysh soltysh deleted the issue13281 branch May 21, 2017 18:49
dcbw added a commit to dcbw/origin that referenced this pull request May 24, 2017
…xup)

Previous backport missed one case of Semantic -> Generic.

Fixes: openshift#14158
deads2k pushed a commit to deads2k/kubernetes that referenced this pull request Jun 7, 2017
…xup)

Previous backport missed one case of Semantic -> Generic.

Fixes: openshift/origin#14158

:100644 100644 dc9380fc96... b9be890bff... M	pkg/kubelet/dockershim/cm/container_manager_linux.go
deads2k pushed a commit to openshift/kubernetes that referenced this pull request Jun 7, 2017
…xup)

Previous backport missed one case of Semantic -> Generic.

Fixes: openshift/origin#14158

:100644 100644 dc9380fc96... b9be890bff... M	pkg/kubelet/dockershim/cm/container_manager_linux.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Latest docker version breaks kubelet in 1.5.0-alpha.3
3 participants