Skip to content

[release/1.3] Bump Golang 1.13.12#4337

Merged
dmcgowan merged 1 commit intocontainerd:release/1.3from
AkihiroSuda:golang-1.13.12-containerd1.3
Jun 23, 2020
Merged

[release/1.3] Bump Golang 1.13.12#4337
dmcgowan merged 1 commit intocontainerd:release/1.3from
AkihiroSuda:golang-1.13.12-containerd1.3

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Jun 23, 2020

Essentially cherry-picking #4260 #4333
(but without git-cherry-pick(1) due to the code divergence between v1.3 and master caused by CI changes)

Essentially cherry-picking containerd#4260 containerd#4333
(but without `git-cherry-pick(1)` due to the code divergence between v1.3 and master caused by CI changes)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda force-pushed the golang-1.13.12-containerd1.3 branch from 54df50f to 0ade3c2 Compare June 23, 2020 07:48
@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jun 23, 2020

no change for .zuul/playbooks/containerd-build/run.yaml?

@AkihiroSuda
Copy link
Copy Markdown
Member Author

@containerd containerd deleted a comment from theopenlab-ci bot Jun 23, 2020
@crosbymichael
Copy link
Copy Markdown
Member

LGTM

Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan merged commit 60cf2f0 into containerd:release/1.3 Jun 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants