From ac88082399d19657290f0e8915081be6654b5571 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcgstyle.net>
Date: Tue, 28 Aug 2018 16:12:23 -0700
Subject: [PATCH] Update mailmap file

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index a14e7f650..01633f51c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,8 @@ Abhinandan Prativadi <abhi@docker.com> abhi <abhi@docker.com>
 Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Akihiro Suda <suda.kyoto@gmail.com>
 Andrei Vagin <avagin@virtuozzo.com> Andrei Vagin <avagin@openvz.org>
 Frank Yang <yyb196@gmail.com> frank yang <yyb196@gmail.com>
+Jie Zhang <iamkadisi@163.com> kadisi <iamkadisi@163.com>
+John Howard <john.howard@microsoft.com> John Howard <jhoward@microsoft.com>
 Justin Terry <juterry@microsoft.com> Justin Terry (VM) <juterry@microsoft.com>
 Justin Terry <juterry@microsoft.com> Justin <jterry75@users.noreply.github.com>
 Kenfe-Mickaël Laventure <mickael.laventure@gmail.com> Kenfe-Mickael Laventure <mickael.laventure@gmail.com>