Prepare for the release.
Update .mailmap, AUTHORS and MAINTAINERS files. Signed-off-by: Richard Scothern <richard.scothern@docker.com>master
							parent
							
								
									fb106e167a
								
							
						
					
					
						commit
						6e2dd4fa68
					
				
							
								
								
									
										4
									
								
								.mailmap
								
								
								
								
							
							
						
						
									
										4
									
								
								.mailmap
								
								
								
								
							|  | @ -13,4 +13,6 @@ Sharif Nassar <sharif@mrwacky.com> Sharif Nassar <mrwacky42@users.noreply.github | |||
| Sven Dowideit <SvenDowideit@home.org.au> Sven Dowideit <SvenDowideit@users.noreply.github.com> | ||||
| Vincent Giersch <vincent.giersch@ovh.net> Vincent Giersch <vincent@giersch.fr> | ||||
| davidli <wenquan.li@hp.com> davidli <wenquan.li@hpe.com> | ||||
| Omer Cohen <git@omer.io> Omer Cohen <git@omerc.net> | ||||
| Omer Cohen <git@omer.io> Omer Cohen <git@omerc.net> | ||||
| Eric Yang <windfarer@gmail.com> Eric Yang <Windfarer@users.noreply.github.com> | ||||
| Nikita Tarasov <nikita@mygento.ru> Nikita <luckyraul@users.noreply.github.com> | ||||
|  |  | |||
							
								
								
									
										7
									
								
								AUTHORS
								
								
								
								
							
							
						
						
									
										7
									
								
								AUTHORS
								
								
								
								
							|  | @ -6,6 +6,8 @@ Adrian Mouat <adrian.mouat@gmail.com> | |||
| Ahmet Alp Balkan <ahmetalpbalkan@gmail.com> | ||||
| Alex Chan <alex.chan@metaswitch.com> | ||||
| Alex Elman <aelman@indeed.com> | ||||
| Alexey Gladkov <gladkov.alexey@gmail.com> | ||||
| allencloud <allen.sun@daocloud.io> | ||||
| amitshukla <ashukla73@hotmail.com> | ||||
| Amy Lindburg <amy.lindburg@docker.com> | ||||
| Andrew Hsu <andrewhsu@acm.org> | ||||
|  | @ -30,6 +32,7 @@ Brian Bland <brian.bland@docker.com> | |||
| burnettk <burnettk@gmail.com> | ||||
| Carson A <ca@carsonoid.net> | ||||
| Chris Dillon <squarism@gmail.com> | ||||
| cyli <cyli@twistedmatrix.com> | ||||
| Daisuke Fujita <dtanshi45@gmail.com> | ||||
| Daniel Huhn <daniel@danielhuhn.de> | ||||
| Darren Shepherd <darren@rancher.com> | ||||
|  | @ -52,6 +55,7 @@ Felix Yan <felixonmars@archlinux.org> | |||
| Florentin Raud <florentin.raud@gmail.com> | ||||
| Frederick F. Kautz IV <fkautz@alumni.cmu.edu> | ||||
| gabriell nascimento <gabriell@bluesoft.com.br> | ||||
| Gleb Schukin <gschukin@ptsecurity.com> | ||||
| harche <p.harshal@gmail.com> | ||||
| Henri Gomez <henri.gomez@gmail.com> | ||||
| Hu Keping <hukeping@huawei.com> | ||||
|  | @ -72,6 +76,7 @@ Jonathan Boulle <jonathanboulle@gmail.com> | |||
| Jordan Liggitt <jliggitt@redhat.com> | ||||
| Josh Hawn <josh.hawn@docker.com> | ||||
| Julien Fernandez <julien.fernandez@gmail.com> | ||||
| Ke Xu <leonhartx.k@gmail.com> | ||||
| Keerthan Mala <kmala@engineyard.com> | ||||
| Kelsey Hightower <kelsey.hightower@gmail.com> | ||||
| Kenneth Lim <kennethlimcp@gmail.com> | ||||
|  | @ -94,6 +99,7 @@ moxiegirl <mary@docker.com> | |||
| Nathan Sullivan <nathan@nightsys.net> | ||||
| nevermosby <robolwq@qq.com> | ||||
| Nghia Tran <tcnghia@gmail.com> | ||||
| Nikita Tarasov <nikita@mygento.ru> | ||||
| Nuutti Kotivuori <nuutti.kotivuori@poplatek.fi> | ||||
| Oilbeater <liumengxinfly@gmail.com> | ||||
| Olivier Gambier <olivier@docker.com> | ||||
|  | @ -137,4 +143,5 @@ xg.song <xg.song@venusource.com> | |||
| xiekeyang <xiekeyang@huawei.com> | ||||
| Yann ROBERT <yann.robert@anantaplex.fr> | ||||
| yuzou <zouyu7@huawei.com> | ||||
| zhouhaibing089 <zhouhaibing089@gmail.com> | ||||
| 姜继忠 <jizhong.jiangjz@alibaba-inc.com> | ||||
|  |  | |||
|  | @ -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" | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue