8000 Comparing v1.2.12...v1.2.13 · containerd/containerd · GitHub
[go: up one dir, main page]
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.12
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.13
Choose a head ref
  • 16 commits
  • 22 files changed
  • 8 contributors

Commits on Feb 5, 2020

  1. bump cgroups dependency to address blki 8000 o issue 

    Signed-off-by: Laurent Bernaille <laurent.bernaille@datadoghq.com>
    @lbernail
    lbernail committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    25a806c View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2020

  1. Pin to libseccomp 2.3.3 

    lib seccomp 2.4 has huge performance regressions.
This change pins to 2.3.3 where that is not an issue

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit b5f03ea)
Signed-off-by: Ciprian Hacman <ciprian.hacman@sematext.com>
    @crosbymichael
    crosbymichael authored and Ciprian Hacman committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    6ad2553 View commit details
    Browse the repository at this point in the history

  2. Fix incorrect comment from copy/paste of starting script 

    Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(cherry picked from commit 75d0c5f)
Signed-off-by: Ciprian Hacman <ciprian.hacman@sematext.com>
    @estesp
    estesp authored and Ciprian Hacman committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    a7c9b76 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. Update Golang 1.12.17 

    full diff: golang/go@go1.12.16...go1.12.17

go1.12.17 (released 2020/02/12) includes a fix to the runtime. See the Go 1.12.17
milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.12.17+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6a34164)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    2a0ca2d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4015 from hakman/fix-libseccomp-ver 

    [release/1.2 backport] Pin to libseccomp 2.3.3
    @estesp
    estesp authored Feb 17, 2020
    Configuration menu
    Copy the full SHA
    01edb7c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4001 from DataDog/lbernail/upgrade-cgroups 

    [release/1.2] bump cgroups dependency to address blkio issue
    @estesp
    estesp authored Feb 17, 2020
    Configuration menu
    Copy the full SHA
    5bead45 View commit details
    Browse the repository at this point in the history

  4. script: use github.com/kubernetes-sigs/cri-tools directly 

    When we call `go get -d -v
github.com/kubernetes-incubator/cri-tools/...` which repos has been
moved to `github.com/kubernetes-sigs/cri-tools`, `go get` will create
package `github.com/kubernetes-sigs/cri-tools`.

```
go get -d -v github.com/kubernetes-incubator/cri-tools/...
github.com/kubernetes-incubator/cri-tools (download)
github.com/kubernetes-sigs/cri-tools (download)
```

According to old version of `github.com/kubernetes-incubator/cri-tools`
Makefile, if there is no `github.com/kubernetes-sigs/cri-tools` package,
it will create softlink self to `github.com/kubernetes-sigs/cri-tools`.
But `go get` will create `github.com/kubernetes-sigs/cri-tools` and
there is no softlink. Therefore, the critools are always latest one, not
specific version.

So, use `github.com/kubernetes-sigs/cri-tools` will be better and save
traffic from `go get`.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 246a560)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
    @fuweid
    fuweid committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    28eb964 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4031 from thaJeztah/1.2_bump_golang_1.12.17 

    [release/1.2 backport] Update Golang 1.12.17
    @fuweid
    fuweid authored Feb 17, 2020
    Configuration menu
    Copy the full SHA
    c952428 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4035 from fuweid/cp12-246a560e 

    [release/1.2 backport] script: use github.com/kubernetes-sigs/cri-tools directly
    @estesp
    estesp authored Feb 17, 2020
    Configuration menu
    Copy the full SHA
    89c46ed View commit details
    Browse the repository at this point in the history

  7. Set octet-stream content-type on put request 

    Signed-off-by: Josh Dolitsky <393494+jdolitsky@users.noreply.github.com>
    @jdolitsky @estesp
    jdolitsky authored and estesp committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    567ca67 View commit details
    Browse the repository at this point in the history

  8. Fix container pid. 

    Signed-off-by: Lantao Liu <lantaol@google.com>
(cherry picked from commit a6b6097)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @Random-Liu @thaJeztah
    Random-Liu authored and thaJeztah committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    b970987 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4028 from estesp/cp-1.2-4017 

    [release/1.2] backport: Set octet-stream content-type on put request
    @estesp
    estesp authored Feb 17, 2020
    Configuration menu
    Copy the full SHA
    1f6ea50 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. Merge pull request #4025 from thaJeztah/1.2_backport_fix_container_pid 

    [release/1.2 backport] Fix container pid race condition
    @fuweid
    fuweid authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    b9b4fa7 View commit details
    Browse the repository at this point in the history

  2. Update .mailmap with changes from master 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    0c10aca View commit details
    Browse the repository at this point in the history

  3. Prepare v1.2.13 release 

    The thirteenth patch release for `containerd` 1.2 fixes a regression introduced
in v1.2.12 that caused container/shim to hang on single core machines, fixes an
issue with blkio, and updates the Golang runtime to 1.12.17.

Notable Updates
----------------------------------

* Fix container pid race condition [#4025](#4025)
* Update containerd/cgroups dependency to address blkio issue [#4001](#4001)
* Set octet-stream content-type on PUT request [#4028](#4028)
* Pin to libseccomp 2.3.3 to preserve compatibility with hosts that do not have libseccomp 2.4 or higher installed [#4015](#4015)
* Update Golang runtime to 1.12.17, which includes a fix to the runtime [#4031](#4031)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    f141d0f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4033 from thaJeztah/release_1.2.13 

    [release/1.2] Prepare v1.2.13 release
    @dmcgowan
    dmcgowan authored Feb 18, 2020
    Configuration menu
    Copy the full SHA
    7ad1843 View commit details
    Browse the repository at this point in the history
Loading
0