Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containerd/containerd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.1
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2.2
Choose a head ref
  • 10 commits
  • 11 files changed
  • 5 contributors

Commits on Dec 14, 2018

  1. 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>
    crosbymichael authored and andrewhsu committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    18f57e2 View commit details
    Browse the repository at this point in the history
  2. 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>
    thaJeztah committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    27c6449 View commit details
    Browse the repository at this point in the history
  3. 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)
    crosbymichael authored Dec 14, 2018
    Configuration menu
    Copy the full SHA
    31be864 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #2878 from andrewhsu/backport-1.2-fifo-timeout

    [release/1.2] Add timeout and cancel to shim fifo open
    dmcgowan authored Dec 14, 2018
    Configuration menu
    Copy the full SHA
    aa5e000 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. 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>
    thaJeztah committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    e71a191 View commit details
    Browse the repository at this point in the history
  2. 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)"
    crosbymichael authored Dec 19, 2018
    Configuration menu
    Copy the full SHA
    46e6333 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2019

  1. Update cri to 0d5cabd006cb5319dc965046067b8432d9fa5ef8 (branch releas…

    …e/1.2).
    
    Signed-off-by: Lantao Liu <lantaol@google.com>
    Random-Liu committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    f30fd02 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2019

  1. Merge pull request #2912 from Random-Liu/update-cri-release-1.2

    [release/1.2] Update cri to 0d5cabd006cb5319dc965046067b8432d9fa5ef8
    AkihiroSuda authored Jan 5, 2019
    Configuration menu
    Copy the full SHA
    4bb2b0c View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Update for 1.2.2 release

    Add release notes, update version, and add Mike's new email to mailmap
    
    Signed-off-by: Derek McGowan <derek@mcgstyle.net>
    dmcgowan committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    ef63704 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2019

  1. Merge pull request #2917 from dmcgowan/release-1.2.2

    [release/1.2] 1.2.2 release
    dmcgowan authored Jan 8, 2019
    Configuration menu
    Copy the full SHA
    9754871 View commit details
    Browse the repository at this point in the history
Loading