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: 63522d9
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08f7ee9
Choose a head ref
  • 19 commits
  • 42 files changed
  • 10 contributors

Commits on Jun 7, 2018

  1. Update adding maintainer section

    Updates the maintainers file to align with the process
    we have been following for adding maintainers and reviewers.
    
    Signed-off-by: Derek McGowan <derek@mcgstyle.net>
    dmcgowan committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    7ba62b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. Merge pull request #2370 from dmcgowan/update-maintainers-rules

    Update adding maintainer section
    crosbymichael authored Jun 8, 2018
    Configuration menu
    Copy the full SHA
    35887db View commit details
    Browse the repository at this point in the history
  2. Replace gotestyourself by gotest.tools

    github.com/gotestyourself/gotestyourself moved to gotest.tools with
    version 2.0.0. Moving to that one, bumping it to v2.1.0.
    
    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    vdemeester committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    3830180 View commit details
    Browse the repository at this point in the history
  3. Update tests to use gotest.tools angel

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    vdemeester committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    832b05a View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Merge pull request #2393 from vdemeester/gotestyourself-with-tools

    Update gotestyourself to gotest.tools
    mlaventure authored Jun 11, 2018
    Configuration menu
    Copy the full SHA
    0158a6f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Docs: Fix incomplete instructions for building using docker

    Fixes: #2396
    
    Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
    Harshal Patil committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    ef449aa View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Merge pull request #2397 from harche/doc_fix

    Docs: Fix incomplete instructions for building using docker
    estesp authored Jun 14, 2018
    Configuration menu
    Copy the full SHA
    c1e1f3d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Update architecture.md

    Signed-off-by: Andrew Osheroff <andrewosh@gmail.com>
    Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
    andrewosh authored and estesp committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    3c5b0dc View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. images: provide better error for manifest list match error

    Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
    tonistiigi committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    53fe31d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Move ContainerFlags to "commands" package

    Commit 0551328 exposed the "rootfs"
    and "no-pivot" flags for the "containers" command, but it accidentally
    removed them for "run" since package-level variables are initialized
    before package-level init functions in golang. Hoisting these flags to
    a package imported by both commands solves the problem.
    
    Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
    flx42 committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    5dd22a2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2410 from tonistiigi/mlist-error

    images: provide better error for manifest list match error
    estesp authored Jun 21, 2018
    Configuration menu
    Copy the full SHA
    7ff2748 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Fix arm platform matching

    The normalization was being inconsistently applied causing a
    failure to match some platforms in manifest lists.
    Fix the matcher and normalization to be more consistent and
    add changes to parser to prevent the defaulted variants from being
    set in the platform structure.
    
    Signed-off-by: Derek McGowan <derek@mcgstyle.net>
    dmcgowan committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    37ab93e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2408 from estesp/carry-2363

    Update architecture.md (Carry PR 2363)
    estesp authored Jun 22, 2018
    Configuration menu
    Copy the full SHA
    995310c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2414 from dmcgowan/platform-arm-normalization

    Fix arm platform matching
    dmcgowan authored Jun 22, 2018
    Configuration menu
    Copy the full SHA
    47a128d View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2018

  1. Normalize arm64 to an empty variant

    Signed-off-by: Derek McGowan <derek@mcgstyle.net>
    dmcgowan committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    db3c5af View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Merge pull request #2417 from dmcgowan/update-arm64-normalize

    Normalize arm64 to an empty variant
    crosbymichael authored Jun 25, 2018
    Configuration menu
    Copy the full SHA
    f15c3be View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2411 from flx42/move-containerflags

    Move ContainerFlags to "commands" package
    stevvooe authored Jun 25, 2018
    Configuration menu
    Copy the full SHA
    1ac546b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. Set shim max procs via env var

    This sets the shim's max procs to 2, like we already have hard coded in
    the shim, with the env var so that it is set at go runtime boot.
    
    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    crosbymichael committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    68e144c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2423 from crosbymichael/shim-procs

    Set shim max procs via env var
    mlaventure authored Jun 26, 2018
    Configuration menu
    Copy the full SHA
    08f7ee9 View commit details
    Browse the repository at this point in the history
Loading