Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 3d34789f6b64 · 2019-05-14T14:09:49.000-07:00
diff --git a/.mailmap b/.mailmap
@@ -29,12 +29,11 @@ Daniel Duan <daniel@duan.org> <danmarner@gmail.com>
 Dante Broggi <34220985+Dante-Broggi@users.noreply.github.com>
 Dave <davesweeris@mac.com>
 Dave Abrahams <dabrahams@apple.com> <dave@boostpro.com>
-Dave Abrahams <dabrahams@apple.com> <dave@fripp.apple.com>
 Dave Abrahams <dabrahams@apple.com> <dave@Skree.local>
 Dave Abrahams <dabrahams@apple.com> <dave@Wingy.local>
 Dave Lee <davelee@lyft.com> <davelee.com@gmail.com>
-David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
-David Rönnqvist <david.ronnqvist@gmail.com>
+David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
+David Rönnqvist <david.ronnqvist@gmail.com>
 David Ungar <dungar@apple.com> <ungar@mac.com>
 David Zarzycki <dave@znu.io> <zarzycki@apple.com>
 David Zarzycki <dave@znu.io> <zarzycki@icloud.com>
@@ -43,10 +42,8 @@ Davide Italiano <ditaliano@apple.com> <dcci@users.noreply.github.com>
 Davide Italiano <ditaliano@apple.com> <dccitaliano@gmail.com>
 Dmitri Gribenko <gribozavr@gmail.com> <dgribenko@apple.com>
 Doug Coleman <doug_coleman@apple.com> <doug.coleman@gmail.com>
-Enrico Granata <egranata@apple.com> <egranata@egranata.apple.com>
 Enrico Granata <egranata@apple.com> <granata.enrico@gmail.com>
 Erik Eckstein <eeckstein@apple.com>
-Erik Eckstein <eeckstein@apple.com> <eeckstein@rad-main.corp.apple.com>
 Erik Verbruggen <erik.verbruggen@me.com> <erikjv@users.noreply.github.com>
 Ewa Matejska <ematejska@apple.com>
 Ewa Matejska <ematejska@apple.com> <ematejska@Ewas-MacBook-Pro.local>
@@ -130,15 +127,13 @@ Ross Bayer <ross.m.bayer@gmail.com>
 Russ Bishop <rbishopjr@apple.com> <russ@plangrid.com>
 Ryan Lovelett <ryan@lovelett.me> <RLovelett@users.noreply.github.com>
 Shawn Erickson <shawn.erickson@citrix.com> <shawnce@gmail.com>
-Slava Pestov <spestov@apple.com> <spestov@rad-main.corp.apple.com>
 Slava Pestov <spestov@apple.com> <sviatoslav.pestov@gmail.com>
 Stephen Canon <scanon@apple.com>
 Stephen Canon <scanon@apple.com> <stephentyrone@gmail.com>
 Sukolsak Sakshuwong <sukolsak@gmail.com>
 Todd Fiala <tfiala@apple.com> <todd.fiala@gmail.com>
 Toni Suter <tonisuter@me.com> <tonisuter@users.noreply.github.com>
 Vedant Kumar <vsk@apple.com> <vk@vedantk.com>
-Xi Ge <xi_ge@apple.com> <xi_ge@rad-main.corp.apple.com>
 Xin Tong <xin_tong@apple.com> <trent.xin.tong@gmail.com>
 Xin Tong <xin_tong@apple.com> <trentxintong@Xins-MacBook-Pro.local>
 Yuka Ezura <ezura@users.noreply.github.com> <2020337+ezura@users.noreply.github.com>

-Original file line number
+Diff line change
 Dante Broggi <[email protected]>
 Dave <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 -Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Lee <[email protected]> <[email protected]>
 -David Rönnqvist <[email protected]> <[email protected]>
 -David Rönnqvist <[email protected]>
 +David Rönnqvist <[email protected]> <[email protected]>
 +David Rönnqvist <[email protected]>
 David Ungar <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 Davide Italiano <[email protected]> <[email protected]>
 Dmitri Gribenko <[email protected]> <[email protected]>
 Doug Coleman <[email protected]> <[email protected]>
 -Enrico Granata <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 Erik Eckstein <[email protected]>
 -Erik Eckstein <[email protected]> <[email protected]>
 Erik Verbruggen <[email protected]> <[email protected]>
 Ewa Matejska <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
 Russ Bishop <[email protected]> <[email protected]>
 Ryan Lovelett <[email protected]> <[email protected]>
 Shawn Erickson <[email protected]> <[email protected]>
 -Slava Pestov <[email protected]> <[email protected]>
 Slava Pestov <[email protected]> <[email protected]>
 Stephen Canon <[email protected]>
 Stephen Canon <[email protected]> <[email protected]>
 Sukolsak Sakshuwong <[email protected]>
 Todd Fiala <[email protected]> <[email protected]>
 Toni Suter <[email protected]> <[email protected]>
 Vedant Kumar <[email protected]> <[email protected]>
 -Xi Ge <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Yuka Ezura <[email protected]> <[email protected]>