Merged
Conversation
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
5 tasks
Member
|
Failures are not related; a Jenkins plugin was updated and was incompatible; I'll restart the builds |
Member
|
LGTM |
1 similar comment
Contributor
|
LGTM |
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
backport from moby#22088 Signed-off-by: Amit Krishnan <krish.amit@gmail.com> Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com>
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
Fix docker logs hang
Steps to reproduce the issue:
1. Run the attached script, eventually the `docker logs -f` command will hang:
```
#!/bin/bash
while true
do
container_id="$(docker run -d ubuntu:latest /bin/bash -e -c "echo -n \"foo\"")"
docker logs -f "${container_id}"
done
```
fix DTS2017062809604
backport from moby#31856
backport from moby#27782
backport from moby#22088
conflicts:
daemon/attach.go
daemon/logs.go
daemon/logger/journald/read.go
daemon/logger/jsonfilelog/read.go
daemon/logs.go
Signed-off-by: Jim Minter <jminter@redhat.com>
Signed-off-by: Tom Booth <tombooth@gmail.com>
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com>
See merge request docker/docker!625
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fsnotify has released a new version v1.2.11 which contains among other things a patch to build clean for Solaris in the form of fen.go which is a stub for FEN(File Event Notifications) framework.
This PR is to get the version of fsnotify bumped up in the Docker Engine as it is a dependency for an ongoing effort towards a native port of Docker on Solaris.
Signed-off-by: Amit Krishnan krish.amit@gmail.com