Skip to content

modify-document-duplicate-word#3621

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
tanjunchen:modify-document-repeat-word
Sep 5, 2019
Merged

modify-document-duplicate-word#3621
crosbymichael merged 1 commit intocontainerd:masterfrom
tanjunchen:modify-document-repeat-word

Conversation

@tanjunchen
Copy link
Copy Markdown
Contributor

@tanjunchen tanjunchen commented Sep 4, 2019

No description provided.

@tanjunchen
Copy link
Copy Markdown
Contributor Author

tanjunchen commented Sep 4, 2019

@fuweid I am sorry , The last pull request was closed because of my mistake.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 4, 2019

Build succeeded.

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Sep 4, 2019

Thanks @tanjunchen . but please sign your commit by git commit -s --amend --no-edit. Thanks

@tanjunchen
Copy link
Copy Markdown
Contributor Author

tanjunchen commented Sep 4, 2019

@fuweid ok I will do it

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 4, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Sep 4, 2019 •
edited
Loading

Codecov Report

Merging #3621 into master will decrease coverage by 8.75%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #3621      +/-   ##
=========================================
- Coverage   45.96%   37.2%   -8.76%     
=========================================
  Files         114      84      -30     
  Lines       11242   11574     +332     
=========================================
- Hits         5167    4306     -861     
- Misses       5176    6668    +1492     
+ Partials      899     600     -299
Flag Coverage Δ
#linux ?
#windows 37.2% <ø> (?)
Impacted Files Coverage Δ
platforms/database.go 81.48% <ø> (-1.22%) ⬇️
archive/tar_opts.go 11.76% <0%> (-59.67%) ⬇️
cio/io.go 1.4% <0%> (-53.6%) ⬇️
snapshots/native/native.go 1.79% <0%> (-51.25%) ⬇️
archive/tar.go 18.95% <0%> (-37.75%) ⬇️
metadata/snapshot.go 23.86% <0%> (-32.64%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 57.69% <0%> (-6.51%) ⬇️
content/local/store.go 49.52% <0%> (-5.29%) ⬇️
metadata/images.go 57.57% <0%> (-4.99%) ⬇️
... and 115 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 59a625d...8788af7. Read the comment docs.

estesp
estesp requested changes Sep 4, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first change is actually incorrect because of a separate typo: "s/on on/in on/". If you can fix that the other correction looks fine.

Comment thread oci/spec_test.go Outdated
Copy link
Copy Markdown
Member

@estesp estesp Sep 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the typo here is that the first "on" should have been "in", so that it says "Windows section of spec not filled in on Windows platform"; please update.

@estesp
Copy link
Copy Markdown
Member

estesp commented Sep 4, 2019

Can you squash the commits and make sure it is signed? The new commit you added isn't signed and will fail CI because of that. Thanks!

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 4, 2019

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 5, 2019

Build succeeded.

@tanjunchen
Copy link
Copy Markdown
Contributor Author

tanjunchen commented Sep 5, 2019

/retest

@tanjunchen
Copy link
Copy Markdown
Contributor Author

tanjunchen commented Sep 5, 2019

@estesp what is wrong?
image

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Sep 5, 2019

@tanjunchen there is no robot :) . please repush it to trigger CI. Thanks!

@tanjunchen
Copy link
Copy Markdown
Contributor Author

tanjunchen commented Sep 5, 2019

@fuweid OK Thanks

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Sep 5, 2019 

--- FAIL: TestLoadConfigWithCircularImports (0.01s)
    config_test.go:178: assertion failed: 
        --- ←
        +++ out.Imports
        {[]string}[0]:
        	-: "/tmp/containerd_544849652/data1.toml"
        	+: "/tmp/containerd_544849652/data2.toml"
        {[]string}[1]:
        	-: "/tmp/containerd_544849652/data2.toml"
        	+: "/tmp/containerd_544849652/data1.toml"

ref to #3623

estesp
estesp approved these changes Sep 5, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Sep 5, 2019

LGTM

@crosbymichael crosbymichael merged commit eaa24d6 into containerd:master Sep 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@tanjunchen @fuweid @codecov-io @estesp @crosbymichael