-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Comparing changes
Open a pull request
base repository: containerd/containerd
base: v1.2.1
head repository: containerd/containerd
compare: v1.2.2
- 10 commits
- 11 files changed
- 5 contributors
Commits on Dec 14, 2018
-
Add timeout and cancel to shim fifo open
There is still a special case where the client side fails to open or load causes things to be slow and the shim can lock up when this happens. This adds a timeout to the context for this case to abort fifo creation. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit a2a4241) Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Configuration menu - View commit details
-
Copy full SHA for 18f57e2 - Browse repository at this point
Copy the full SHA 18f57e2View commit details -
Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
Attempt to fix CI is failing due to a regression in Go 1.10.6 / 1.11.3 (see golang/go#29241) ``` package github.com/containernetworking/plugins/...: github.com/containernetworking/plugins/...: invalid import path: malformed import path "github.com/containernetworking/plugins/...": double dot ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 52de371) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Configuration menu - View commit details
-
Copy full SHA for 27c6449 - Browse repository at this point
Copy the full SHA 27c6449View commit details -
Merge pull request #2881 from thaJeztah/1.2_backport_fix_ci_golang_1.11
[release/1.2 backport] Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
Configuration menu - View commit details
-
Copy full SHA for 31be864 - Browse repository at this point
Copy the full SHA 31be864View commit details -
Merge pull request #2878 from andrewhsu/backport-1.2-fifo-timeout
[release/1.2] Add timeout and cancel to shim fifo open
Configuration menu - View commit details
-
Copy full SHA for aa5e000 - Browse repository at this point
Copy the full SHA aa5e000View commit details
Commits on Dec 19, 2018
-
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
This reverts commit 27c6449. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Configuration menu - View commit details
-
Copy full SHA for e71a191 - Browse repository at this point
Copy the full SHA e71a191View commit details -
Merge pull request #2893 from thaJeztah/1.2_revert_temp_golang_fix
[release/1.2] Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
Configuration menu - View commit details
-
Copy full SHA for 46e6333 - Browse repository at this point
Copy the full SHA 46e6333View commit details
Commits on Jan 4, 2019
-
Update cri to 0d5cabd006cb5319dc965046067b8432d9fa5ef8 (branch releas…
…e/1.2). Signed-off-by: Lantao Liu <lantaol@google.com>
Configuration menu - View commit details
-
Copy full SHA for f30fd02 - Browse repository at this point
Copy the full SHA f30fd02View commit details
Commits on Jan 5, 2019
-
Merge pull request #2912 from Random-Liu/update-cri-release-1.2
[release/1.2] Update cri to 0d5cabd006cb5319dc965046067b8432d9fa5ef8
Configuration menu - View commit details
-
Copy full SHA for 4bb2b0c - Browse repository at this point
Copy the full SHA 4bb2b0cView commit details
Commits on Jan 7, 2019
-
Add release notes, update version, and add Mike's new email to mailmap Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Configuration menu - View commit details
-
Copy full SHA for ef63704 - Browse repository at this point
Copy the full SHA ef63704View commit details
Commits on Jan 8, 2019
-
Merge pull request #2917 from dmcgowan/release-1.2.2
[release/1.2] 1.2.2 release
Configuration menu - View commit details
-
Copy full SHA for 9754871 - Browse repository at this point
Copy the full SHA 9754871View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v1.2.1...v1.2.2