Skip to content

Commit 7ad1843

Browse files
dmcgowandmcgowan
authored
Merge pull request #4033 from thaJeztah/release_1.2.13
[release/1.2] Prepare v1.2.13 release
2 parents b9b4fa7 + f141d0f commit 7ad1843

3 files changed

Lines changed: 119 additions & 31 deletions

File tree

‎.mailmap‎

Lines changed: 87 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,90 @@
1-
Abhinandan Prativadi <[email protected]> Abhinandan Prativadi <[email protected]>
2-
Abhinandan Prativadi <[email protected]> abhi <[email protected]>
3-
Akihiro Suda <[email protected]> Akihiro Suda <[email protected]>
4-
Andrei Vagin <[email protected]> Andrei Vagin <[email protected]>
5-
Brent Baude <[email protected]> baude <[email protected]>
6-
Frank Yang <[email protected]> frank yang <[email protected]>
7-
Georgia Panoutsakopoulou <[email protected]> gpanouts <[email protected]>
8-
Jie Zhang <[email protected]> kadisi <[email protected]>
9-
John Howard <[email protected]> John Howard <[email protected]>
10-
Justin Terry <[email protected]> Justin Terry (VM) <[email protected]>
11-
Justin Terry <[email protected]> Justin <[email protected]>
12-
Kenfe-Mickaël Laventure <[email protected]> Kenfe-Mickael Laventure <[email protected]>
13-
Kevin Xu <[email protected]> kevin.xu <[email protected]>
14-
Lu Jingxiao <[email protected]> l00397676 <[email protected]>
15-
Lantao Liu <[email protected]> Lantao Liu <[email protected]>
16-
Phil Estes <[email protected]> Phil Estes <[email protected]>
17-
Stephen J Day <[email protected]> Stephen J Day <[email protected]>
18-
Stephen J Day <[email protected]> Stephen Day <[email protected]>
19-
Stephen J Day <[email protected]> Stephen Day <[email protected]>
20-
Sudeesh John <[email protected]> sudeesh john <[email protected]>
21-
Tõnis Tiigi <[email protected]> Tonis Tiigi <[email protected]>
22-
Lifubang <[email protected]> Lifubang <[email protected]>
23-
Xiaodong Zhang <[email protected]> nashasha1 <[email protected]>
24-
Jian Liao <[email protected]> liaoj <[email protected]>
25-
Jian Liao <[email protected]> liaojian <[email protected]>
26-
Rui Cao <[email protected]> ruicao <[email protected]>
27-
Xuean Yan <[email protected]> yanxuean <[email protected]>
28-
Mike Brown <[email protected]> Mike Brown <[email protected]>
1+
Abhinandan Prativadi <[email protected]>
2+
Abhinandan Prativadi <[email protected]> <[email protected]>
293
Ace-Tang <[email protected]>
30-
Wei Fu <[email protected]>
31-
Andrey Kolomentsev <[email protected]> akolomentsev <[email protected]>
4+
Akihiro Suda <[email protected]> <[email protected]>
5+
Akihiro Suda <[email protected]> <[email protected]>
6+
Allen Sun <[email protected]> <[email protected]>
7+
Alexander Morozov <[email protected]> <[email protected]>
8+
Amit Krishnan <[email protected]> <[email protected]>
9+
Andrei Vagin <[email protected]> <[email protected]>
10+
Andrey Kolomentsev <[email protected]>
11+
Arnaud Porterie <[email protected]>
12+
Arnaud Porterie <[email protected]> <[email protected]>
13+
Bob Mader <[email protected]>
14+
Boris Popovschi <[email protected]>
15+
Brent Baude <[email protected]>
16+
Cao Zhihao <[email protected]>
17+
Cao Zhihao <[email protected]> <[email protected]>
18+
Carlos Eduardo <[email protected]> <[email protected]>
19+
Cristian Staretu <[email protected]>
20+
Cristian Staretu <[email protected]> <[email protected]>
21+
Daniel Dao <[email protected]>
22+
Edgar Lee <[email protected]> <[email protected]>
23+
Eric Ren <[email protected]> <[email protected]>
24+
Fahed Dorgaa <[email protected]>
25+
Frank Yang <[email protected]>
26+
Fupan Li <[email protected]>
27+
Georgia Panoutsakopoulou <[email protected]>
28+
Guangming Wang <[email protected]>
29+
Haiyan Meng <[email protected]>
30+
Harry Zhang <[email protected]> <[email protected]>
31+
Hu Shuai <[email protected]>
32+
Hu Shuai <[email protected]> <[email protected]>
33+
Jaana Burcu Dogan <[email protected]> <[email protected]>
34+
Jess Valarezo <[email protected]>
35+
Jess Valarezo <[email protected]> <[email protected]>
36+
Jian Liao <[email protected]>
37+
Jian Liao <[email protected]> <[email protected]>
38+
Ji'an Liu <[email protected]>
39+
Jie Zhang <[email protected]>
40+
John Howard <[email protected]>
41+
John Howard <[email protected]> <[email protected]>
42+
John Howard <[email protected]> <[email protected]>
43+
John Howard <[email protected]> <[email protected]>
44+
Luc Perkins <[email protected]>
45+
Julien Balestra <[email protected]>
46+
Justin Cormack <[email protected]> <[email protected]>
47+
Justin Terry <[email protected]>
48+
Justin Terry <[email protected]> <[email protected]>
49+
Kenfe-Mickaël Laventure <[email protected]>
50+
Kevin Kern <[email protected]>
51+
Kevin Xu <[email protected]>
52+
Kohei Tokunaga <[email protected]>
53+
Krasi Georgiev <[email protected]> <[email protected]>
54+
Lantao Liu <[email protected]>
55+
Lantao Liu <[email protected]> <[email protected]>
56+
Lifubang <[email protected]> <[email protected]>
57+
Lu Jingxiao <[email protected]>
58+
Maksym Pavlenko <[email protected]> <[email protected]>
59+
Mario Hros <[email protected]>
60+
Mario Hros <[email protected]> <[email protected]>
3261
Mark Gordon <[email protected]>
62+
Michael Katsoulis <[email protected]>
63+
Mike Brown <[email protected]> <[email protected]>
64+
Nishchay Kumar <[email protected]>
65+
Oliver Stenbom <[email protected]> <[email protected]>
66+
Phil Estes <[email protected]> <[email protected]>
3367
Reid Li <[email protected]>
68+
Ross Boucher <[email protected]>
69+
Ruediger Maass <[email protected]>
70+
Rui Cao <[email protected]> <[email protected]>
71+
Sakeven Jiang <[email protected]>
72+
Seth Pellegrino <[email protected]> <[email protected]>
73+
Shengbo Song <[email protected]>
74+
Stephen J Day <[email protected]> <[email protected]>
75+
Stephen J Day <[email protected]> <[email protected]>
76+
Stephen J Day <[email protected]> <[email protected]>
77+
Sudeesh John <[email protected]>
78+
Su Fei <[email protected]> <[email protected]>
79+
Tõnis Tiigi <[email protected]>
80+
Wei Fu <[email protected]> <[email protected]>
81+
Xiaodong Zhang <[email protected]>
82+
Xuean Yan <[email protected]>
83+
Yue Zhang <[email protected]>
84+
Yuxing Liu <[email protected]>
85+
Zhang Wei <[email protected]>
86+
Zhenguang Zhu <[email protected]>
87+
Zhongming Chang<[email protected]>
88+
Zhoulin Xie <[email protected]>
89+
Zhoulin Xie <[email protected]> <[email protected]>
90+
张潇 <[email protected]>

‎releases/v1.2.13.toml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# commit to be tagged for new release
2+
commit = "HEAD"
3+
4+
project_name = "containerd"
5+
github_repo = "containerd/containerd"
6+
match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"
7+
8+
# previous release
9+
previous = "v1.2.12"
10+
11+
pre_release = false
12+
13+
preface = """\
14+
The thirteenth patch release for `containerd` 1.2 fixes a regression introduced
15+
in v1.2.12 that caused container/shim to hang on single core machines, fixes an
16+
issue with blkio, and updates the Golang runtime to 1.12.17.
17+
18+
### Notable Updates
19+
20+
* Fix container pid race condition [containerd#4025](https://github.com/containerd/containerd/pull/4025)
21+
* Update containerd/cgroups dependency to address blkio issue [containerd#4001](https://github.com/containerd/containerd/pull/4001)
22+
* Set octet-stream content-type on PUT request [containerd#4028](https://github.com/containerd/containerd/pull/4028)
23+
* Pin to libseccomp 2.3.3 to preserve compatibility with hosts that do not have libseccomp 2.4 or higher installed [containerd#4015](https://github.com/containerd/containerd/pull/4015)
24+
* Update Golang runtime to 1.12.17, which includes a fix to the runtime [containerd#4031](https://github.com/containerd/containerd/pull/4031)
25+
26+
"""
27+
28+
# notable prs to include in the release notes, 1234 is the pr number
29+
[notes]
30+
31+
[breaking]

‎version/version.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var (
2121
Package = "github.com/containerd/containerd"
2222

2323
// Version holds the complete version number. Filled in at linking time.
24-
Version = "1.2.12+unknown"
24+
Version = "1.2.13+unknown"
2525

2626
// Revision is filled with the VCS (e.g. git) revision being used to build
2727
// the program at linking time.

0 commit comments

Comments
 (0)