merge branch 'pr-214'

cyphar · cyphar · commit 93db3b16e673 · 2019-03-06T17:30:41.000+11:00
update email in MAINTAINERS LGTMs: @xiekeyang @cyphar Closes #214
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -2,11 +2,11 @@ Brandon Philips <brandon.philips@coreos.com> (@philips)
 Brendan Burns <bburns@microsoft.com> (@brendandburns)
 Jason Bouzane <jbouzane@google.com> (@jbouzane)
 John Starks <jostarks@microsoft.com> (@jstarks)
-Jonathan Boulle <jon.boulle@coreos.com> (@jonboulle)
+Jonathan Boulle <jon@nstack.com> (@jonboulle)
 Stephen Day <stephen.day@docker.com> (@stevvooe)
 Vincent Batts <vbatts@redhat.com> (@vbatts)
 Xie Keyang <xiekeyang@huawei.com> (@xiekeyang)
 Lei Jitang <leijitang@huawei.com> (@coolljt0725)
 Aleksa Sarai <asarai@suse.de> (@cyphar)
 Zhou Hao <zhouhao@cn.fujitsu.com> (@q384566678)
-Ma Shimiao <mashimiao.fnst@cn.fujitsu.com> (@Mashimiao)
+Ma Shimiao <shimiao.ma@gmail.com> (@Mashimiao)

-Original file line number
+Diff line change
 Brendan Burns <[email protected]> (@brendandburns)
 Jason Bouzane <[email protected]> (@jbouzane)
 John Starks <[email protected]> (@jstarks)
 -Jonathan Boulle <jon.boulle@coreos.com> (@jonboulle)
 +Jonathan Boulle <jon@nstack.com> (@jonboulle)
 Stephen Day <[email protected]> (@stevvooe)
 Vincent Batts <[email protected]> (@vbatts)
 Xie Keyang <[email protected]> (@xiekeyang)
 Lei Jitang <[email protected]> (@coolljt0725)
 Aleksa Sarai <[email protected]> (@cyphar)
 Zhou Hao <[email protected]> (@q384566678)
 -Ma Shimiao <[email protected].com> (@Mashimiao)
 +Ma Shimiao <shimiao.ma@gmail.com> (@Mashimiao)