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

Merge pull request #29418 from aboch/p66 #65

Merged
merged 1 commit into from
Jun 12, 2017
Merged

Merge pull request #29418 from aboch/p66 #65

merged 1 commit into from
Jun 12, 2017

Conversation

seemethere
Copy link
Contributor

Cherry-picked from: moby/moby#33609

[1.13.x] Fix buildIpamResources()
(cherry picked from commit 4d2be03b68dd54d8f2307e8b4178ad8ed8d5d343)
Signed-off-by: Sebastiaan van Stijn github@gone.nl
(cherry picked from commit 27498a3)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com

@vieux @seemethere
Merge pull request #29418 from aboch/p66
091732e 
[1.13.x] Fix buildIpamResources()
(cherry picked from commit 4d2be03b68dd54d8f2307e8b4178ad8ed8d5d343)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 27498a3)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
thaJeztah
thaJeztah approved these changes Jun 10, 2017
View reviewed changes
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

@andrewhsu andrewhsu mentioned this pull request Jun 10, 2017
Closed
40 tasks
@andrewhsu
Copy link
Contributor

@aboch seems to be an error with the windows PR build:

01:02:42.323 ----------------------------------------------------------------------
01:02:42.323 FAIL: check_test.go:97: DockerSuite.TearDownTest
01:02:42.323 
01:02:42.323 check_test.go:98:
01:02:42.323     testEnv.Clean(c, dockerBinary)
01:02:42.323 environment/clean.go:63:
01:02:42.323     t.Fatalf("error removing containers %v : %v (%s)", containers, result.Error, result.Combined())
01:02:42.323 ... Error: error removing containers [e63278392a9f] : exit status 1 (Error response from daemon: Could not kill running container e63278392a9fda73774561560215bd128bbc8c9c23c72763420b6364b34bc730, cannot remove - Cannot kill container e63278392a9fda73774561560215bd128bbc8c9c23c72763420b6364b34bc730: invalid container: e63278392a9fda73774561560215bd128bbc8c9c23c72763420b6364b34bc730
01:02:42.324 )
01:02:42.324 
01:02:42.324 
01:02:42.324 ----------------------------------------------------------------------
01:02:42.324 PANIC: docker_cli_run_test.go:1962: DockerSuite.TestRunCidFileCheckIDLength
01:02:42.324 
01:02:42.324 ... Panic: Fixture has panicked (see related PANIC)
01:02:42.324 
01:02:42.324 ----------------------------------------------------------------------

@thaJeztah
Copy link
Member

Could be flaky; some of the TearDownTests are notorious; https://github.com/moby/moby/issues?utf8=✓&q=is%3Aissue%20%22TearDownTest%22%20

@andrewhsu
Copy link
Contributor

LGTM

rolling with the flakey assumption

@andrewhsu andrewhsu merged commit da2d17a into docker-archive:17.06 Jun 12, 2017
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
@seemethere seemethere deleted the cherry_pick_33609 branch August 2, 2017 21:34
docker-jenkins pushed a commit to seemethere/docker-ce that referenced this pull request Dec 5, 2017
@andrewhsu
Merge pull request docker-archive#65 from seemethere/fix_debian_jessi…
cf1d972 
…e_aarch64

Adds libudev-dev to jessie aarch64 build
Upstream-commit: 6e901d8
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
@andrewhsu
Merge pull request docker-archive#65 from seemethere/fix_debian_jessi…
6e901d8 
…e_aarch64

Adds libudev-dev to jessie aarch64 build
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
@andrewhsu
Merge pull request docker-archive#65 from seemethere/cherry_pick_33609
4ddff28 
Merge pull request #29418 from aboch/p66
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17.06.0
Development

Successfully merging this pull request may close these issues.
4 participants
@seemethere @andrewhsu @thaJeztah @vieux