Skip to content

Conversation

@estesp
Copy link
Contributor

@estesp estesp commented Mar 3, 2016

Bring in the change required for PR #20111

Docker-DCO-1.1-Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com (github: estesp)

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
@runcom
Copy link
Member

runcom commented Mar 3, 2016

LGTM

1 similar comment
@thaJeztah
Copy link
Member

LGTM

@thaJeztah
Copy link
Member

Looks like gccgo was killed https://jenkins.dockerproject.org/job/Docker-PRs-gccgo/2688/console

14:50:15 PASS: docker_api_containers_test.go:88: TestContainerApiPsOmitFields.pN52_github_com_docker_docker_integration_cli.DockerSuite 1.009s
14:50:17 PASS: docker_api_containers_test.go:910: TestContainerApiRename.pN52_github_com_docker_docker_integration_cli.DockerSuite  1.216s
14:50:20 PASS: docker_api_containers_test.go:938: TestContainerApiRestart.pN52_github_com_docker_docker_integration_cli.DockerSuite 1.681s
14:50:21 /go/src/github.com/docker/docker/hack/make/test-integration-cli: line 18:  5588 Killed                  ( bundle .integration-daemon-start; bundle .integration-daemon-setup; bundle_test_integration_cli; bundle .integration-daemon-stop ) 2>&1
14:50:21       5589                       | tee -a "$DEST/test.log"
14:50:24 Build step 'Execute shell' marked build as failure
14:50:25 Archiving artifacts
14:50:25 [PostBuildScript] - Execution post build scripts.
14:50:26 [Docker-PRs-gccgo] $ /bin/sh -xe /tmp/hudson7439847382472088550.sh
14:50:26 + set +x

calavera added a commit that referenced this pull request Mar 3, 2016
Update engine-api vendor for UsernsMode
@calavera calavera merged commit 0efa5e7 into moby:master Mar 3, 2016
@calavera
Copy link
Contributor

calavera commented Mar 3, 2016

passing now:

16:57:26 OK: 1135 passed, 101 skipped
16:57:26 PASS
16:57:26 ok     github.com/docker/docker/integration-cli    5191.965s

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants