diff --git a/.mailmap b/.mailmap index f0452da6..d9910601 100644 --- a/.mailmap +++ b/.mailmap @@ -13,4 +13,6 @@ Sharif Nassar Sharif Nassar Sven Dowideit Vincent Giersch Vincent Giersch davidli davidli -Omer Cohen Omer Cohen \ No newline at end of file +Omer Cohen Omer Cohen +Eric Yang Eric Yang +Nikita Tarasov Nikita diff --git a/AUTHORS b/AUTHORS index 70d52599..9e80e062 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,6 +6,8 @@ Adrian Mouat Ahmet Alp Balkan Alex Chan Alex Elman +Alexey Gladkov +allencloud amitshukla Amy Lindburg Andrew Hsu @@ -30,6 +32,7 @@ Brian Bland burnettk Carson A Chris Dillon +cyli Daisuke Fujita Daniel Huhn Darren Shepherd @@ -52,6 +55,7 @@ Felix Yan Florentin Raud Frederick F. Kautz IV gabriell nascimento +Gleb Schukin harche Henri Gomez Hu Keping @@ -72,6 +76,7 @@ Jonathan Boulle Jordan Liggitt Josh Hawn Julien Fernandez +Ke Xu Keerthan Mala Kelsey Hightower Kenneth Lim @@ -94,6 +99,7 @@ moxiegirl Nathan Sullivan nevermosby Nghia Tran +Nikita Tarasov Nuutti Kotivuori Oilbeater Olivier Gambier @@ -137,4 +143,5 @@ xg.song xiekeyang Yann ROBERT yuzou +zhouhaibing089 姜继忠 diff --git a/MAINTAINERS b/MAINTAINERS index 97f415db..bda40015 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -32,11 +32,6 @@ Email = "aaron.lehmann@docker.com" GitHub = "aaronlehmann" - [people.brianbland] - Name = "Brian Bland" - Email = "brian.bland@docker.com" - GitHub = "BrianBland" - [people.dmcgowan] Name = "Derek McGowan" Email = "derek@mcgstyle.net"