InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update moby to runc and oci 1.0 runtime final rc

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-04-27 14:52:47 -07:00
parent b61ffbfb52
commit 005506d36c
39 changed files with 907 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-cli/docker_cli_service_logs_test.go
View File

@@ -281,5 +281,5 @@ func (s *DockerSwarmSuite) TestServiceLogsTTY(c *check.C) {
result = icmd.RunCmd(cmd)
// for some reason there is carriage return in the output. i think this is
// just expected.
c.Assert(result, icmd.Matches, icmd.Expected{Out: "out\r\nerr\r\n"})
c.Assert(result, icmd.Matches, icmd.Expected{Out: "out\nerr\n"})
}