Skip to content

Commit 3c03f36

Browse files
committed
Land rapid7#4433 - Update mailmap
2 parents 337b2d7 + 38a4776 commit 3c03f36

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

.mailmap

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
1+
bcook-r7 <bcook-r7@github> Brent Cook <[email protected]>
12
bturner-r7 <bturner-r7@github> Brandon Turner <[email protected]>
3+
dheiland-r7 <dheiland-r7@github> Deral Heiland <[email protected]>
4+
dmaloney-r7 <dmaloney-r7@github> David Maloney <[email protected]>
25
dmaloney-r7 <dmaloney-r7@github> David Maloney <[email protected]>
3-
dmaloney-r7 <dmaloney-r7@github> David Maloney <[email protected]> # aka TheLightCosine
6+
dmaloney-r7 <dmaloney-r7@github> dmaloney-r7 <[email protected]>
47
ecarey-r7 <ecarey-r7@github> Erran Carey <[email protected]>
58
farias-r7 <farias-r7@github> Fernando Arias <[email protected]>
69
hmoore-r7 <hmoore-r7@github> HD Moore <[email protected]>
710
hmoore-r7 <hmoore-r7@github> HD Moore <[email protected]>
8-
jlee-r7 <jlee-r7@github> egypt <[email protected]> # aka egypt
9-
jlee-r7 <jlee-r7@github> James Lee <[email protected]> # aka egypt
11+
jhart-r7 <jhart-r7@github> Jon Hart <[email protected]>
1012
jlee-r7 <jlee-r7@github> James Lee <[email protected]>
11-
joev-r7 <joev-r7@github> joev <[email protected]>
13+
jlee-r7 <jlee-r7@github> James Lee <[email protected]> # aka egypt
14+
jlee-r7 <jlee-r7@github> egypt <[email protected]> # aka egypt
1215
joev-r7 <joev-r7@github> Joe Vennix <[email protected]>
16+
joev-r7 <joev-r7@github> joev <[email protected]>
1317
jvazquez-r7 <jvazquez-r7@github> jvazquez-r7 <[email protected]>
1418
jvazquez-r7 <jvazquez-r7@github> jvazquez-r7 <[email protected]>
1519
limhoff-r7 <limhoff-r7@github> Luke Imhoff <[email protected]>
20+
lsanchez-r7 <lsanchez-r7@github> Lance Sanchez <[email protected]>
21+
lsanchez-r7 <lsanchez-r7@github> darkbushido <[email protected]>
22+
mbuck-r7 <mbuck-r7@github> Matt Buck <[email protected]>
23+
mbuck-r7 <mbuck-r7@github> Matt Buck <[email protected]>
24+
parzamendi-r7 <parzamendi-r7@github> parzamendi-r7 <[email protected]>
1625
shuckins-r7 <shuckins-r7@github> Samuel Huckins <[email protected]>
1726
todb-r7 <todb-r7@github> Tod Beardsley <[email protected]>
1827
todb-r7 <todb-r7@github> Tod Beardsley <[email protected]>
1928
todb-r7 <todb-r7@github> Tod Beardsley <[email protected]>
2029
trosen-r7 <trosen-r7@github> Trevor Rosen <[email protected]>
2130
trosen-r7 <trosen-r7@github> Trevor Rosen <[email protected]>
31+
wchen-r7 <wchen-r7@github> Wei Chen <[email protected]>
2232
wchen-r7 <wchen-r7@github> sinn3r <[email protected]> # aka sinn3r
2333
wchen-r7 <wchen-r7@github> sinn3r <[email protected]>
24-
wchen-r7 <wchen-r7@github> Wei Chen <[email protected]>
2534
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
2635
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
2736
wvu-r7 <wvu-r7@github> William Vu <[email protected]>
37+
wvu-r7 <wvu-r7@github> wvu-r7 <[email protected]>
2838

2939
# Above this line are current Rapid7 employees. Below this paragraph are
3040
# volunteers, former employees, and potential Rapid7 employees who, at
@@ -66,25 +76,29 @@ m-1-k-3 <m-1-k-3@github> m-1-k-3 <[email protected]>
6676
m-1-k-3 <m-1-k-3@github> m-1-k-3 <[email protected]>
6777
Meatballs1 <Meatballs1@github> Ben Campbell <[email protected]>
6878
Meatballs1 <Meatballs1@github> Meatballs <[email protected]>
69-
Meatballs1 <Meatballs1@github> Meatballs1 <[email protected]>
79+
Meatballs1 <Meatballs1@github> Meatballs1 <[email protected]>
7080
mubix <mubix@github> Rob Fuller <[email protected]>
7181
nevdull77 <nevdull77@github> Patrik Karlsson <[email protected]>
72-
nmonkee <nmonkee@github> nmonkee <[email protected]>
82+
nmonkee <nmonkee@github> nmonkee <[email protected]>
7383
nullbind <nullbind@github> nullbind <[email protected]>
84+
nullbind <nullbind@github> Scott Sutherland <[email protected]>
7485
ohdae <ohdae@github> ohdae <[email protected]>
75-
OJ <oj@github> OJ Reeves <[email protected]>
7686
OJ <oj@github> OJ <[email protected]>
87+
OJ <oj@github> OJ Reeves <[email protected]>
7788
r3dy <r3dy@github> Royce Davis <[email protected]>
7889
r3dy <r3dy@github> Royce Davis <[email protected]>
7990
Rick Flores <[email protected]> Rick Flores (nanotechz9l) <[email protected]>
8091
rsmudge <rsmudge@github> Raphael Mudge <[email protected]> # Aka `butane
8192
schierlm <schierlm@github> Michael Schierl <[email protected]> # Aka mihi
8293
scriptjunkie <scriptjunkie@github> Matt Weeks <[email protected]>
94+
scriptjunkie <scriptjunkie@github> scriptjunkie <[email protected]>
8395
skape <skape@???> Matt Miller <[email protected]>
8496
spoonm <spoonm@github> Spoon M <[email protected]>
8597
swtornio <swtornio@github> Steve Tornio <[email protected]>
8698
Tasos Laskos <[email protected]> Tasos Laskos <[email protected]>
99+
timwr <timwr@github> Tim Wright <[email protected]>
87100
TrustedSec <[email protected]> trustedsec <[email protected]>
101+
zeroSteiner <zeroSteiner@github> Spencer McIntyre <[email protected]>
88102

89103
# Aliases for utility author names. Since they're fake, typos abound
90104

0 commit comments

Comments
 (0)