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: 4055185
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c444666
Choose a head ref
  • 18 commits
  • 28 files changed
  • 9 contributors

Commits on Oct 18, 2018

  1. fixtypo: misspell in runtime package 

    Signed-off-by: Wei Fu <[email protected]>
    @fuweid
    fuweid committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    accadd7 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Merge pull request #2730 from fuweid/fixtypo_in_runtime_package 

    fixtypo: misspell in runtime package
    @AkihiroSuda
    AkihiroSuda authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    133ac5c View commit details
    Browse the repository at this point in the history

  2. runtime-v2: add validation for runtime name 

    add validation for runtime name, if runtime name is invalid,
containerd will got panic.

Signed-off-by: Ace-Tang <[email protected]>
    @Ace-Tang
    Ace-Tang committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    7b1b16b View commit details
    Browse the repository at this point in the history

  3. Remove containerd-release tool from main repo 

    The release-tool is now located in the `containerd/project` repo.

Signed-off-by: Phil Estes <[email protected]>
    @estesp
    estesp committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    0dd3211 View commit details
    Browse the repository at this point in the history

  4. Correct redundant nil check 

    Signed-off-by: Gábor Lipták <[email protected]>
    @gliptak
    gliptak committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    4a0c406 View commit details
    Browse the repository at this point in the history

  5. Correct spelling 

    Signed-off-by: Gábor Lipták <[email protected]>
    @gliptak
    gliptak committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    9d01160 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. Merge pull request #2735 from estesp/remove-release-tool 

    Remove containerd-release tool from main repo
    @AkihiroSuda
    AkihiroSuda authored Oct 20, 2018
    Configuration menu
    Copy the full SHA
    d452907 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2018

  1. Merge pull request #2736 from gliptak/misspell1 

    Misspell1
    @crosbymichael
    crosbymichael authored Oct 22, 2018
    Configuration menu
    Copy the full SHA
    6f1a54c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2732 from gliptak/patch-1 

    Correct redundant nil check
    @crosbymichael
    crosbymichael authored Oct 22, 2018
    Configuration menu
    Copy the full SHA
    a4b6522 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2018

  1. Update cri to f913714917d2456d7e65a0be84962b1ce8acb487. 

    Signed-off-by: Lantao Liu <[email protected]>
    @Random-Liu
    Random-Liu committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    bee4cc5 View commit details
    Browse the repository at this point in the history

  2. ctr: fix potential panic in metric 

    Signed-off-by: Ace-Tang <[email protected]>
    @Ace-Tang
    Ace-Tang committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    c3cac72 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2740 from Ace-Tang/ctr_metric 

    ctr: fix potential panic in metric
    @estesp
    estesp authored Oct 23, 2018
    Configuration menu
    Copy the full SHA
    52893fb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2741 from Random-Liu/update-cri 

    Update cri to f913714917d2456d7e65a0be84962b1ce8acb487.
    @crosbymichael
    crosbymichael authored Oct 23, 2018
    Configuration menu
    Copy the full SHA
    2f2d6a1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2729 from Ace-Tang/master 

    runtime-v2: add validation for runtime name
    @estesp
    estesp authored Oct 23, 2018
    Configuration menu
    Copy the full SHA
    9fb7eed View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. bugfix: return the context error during event subscribe 

    Signed-off-by: Wei Fu <[email protected]>
    @fuweid
    fuweid committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    15a761c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2742 from fuweid/bugfix_return_context_cancel_err… 

    …or_during_subcribe

bugfix: return the context error during event subscribe
    @dmcgowan
    dmcgowan authored Oct 24, 2018
    Configuration menu
    Copy the full SHA
    c20c569 View commit details
    Browse the repository at this point in the history

  3. Prepare 1.2 release 

    Rename release notes to remove rc label.
Add 1.2 API description text file.
Update version.

Signed-off-by: Derek McGowan <[email protected]>
    @dmcgowan
    dmcgowan committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    e4d2486 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2731 from dmcgowan/release-1.2 

    Prepare 1.2 release
    @dmcgowan
    dmcgowan authored Oct 24, 2018
    Configuration menu
    Copy the full SHA
    c444666 View commit details
    Browse the repository at this point in the history
Loading