diff options
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 113 |
1 files changed, 63 insertions, 50 deletions
@@ -1,57 +1,60 @@ # Daniel DeLeo -Daniel DeLeo <dan@opscode.com> -Daniel DeLeo <dan@opscode.com> Dan DeLeo <danielsdeleo@mac.com> -Daniel DeLeo <dan@opscode.com> Dan DeLeo <dan@kallistec.com> -Daniel DeLeo <dan@opscode.com> danielsdeleo <dan@getchef.com> -Daniel DeLeo <dan@opscode.com> Daniel DeLeo <danielsdeleo@mac.com> +Daniel DeLeo <dan@chef.io> Daniel DeLeo <dan@opscode.com> +Daniel DeLeo <dan@chef.io> Dan DeLeo <danielsdeleo@mac.com> +Daniel DeLeo <dan@chef.io> Dan DeLeo <dan@kallistec.com> +Daniel DeLeo <dan@chef.io> danielsdeleo <dan@getchef.com> +Daniel DeLeo <dan@chef.io> danielsdeleo <dan@opscode.com> +Daniel DeLeo <dan@chef.io> Daniel DeLeo <danielsdeleo@mac.com> # Adam Jacob -Adam Jacob <adam@opscode.com> -Adam Jacob <adam@opscode.com> Adam Jacob <adam@hjksolutions.com> -Adam Jacob <adam@opscode.com> Adam Jacob <adam@latte.(none)> -Adam Jacob <adam@opscode.com> Adam Jacob <adam@ubuntu-apache1.(none)> +Adam Jacob <adam@chef.io> Adam Jacob <adam@opscode.com> +Adam Jacob <adam@chef.io> Adam Jacob <adam@hjksolutions.com> +Adam Jacob <adam@chef.io> Adam Jacob <adam@latte.(none)> +Adam Jacob <adam@chef.io> Adam Jacob <adam@ubuntu-apache1.(none)> # Bryan McLellan -Bryan McLellan <btm@getchef.com> -Bryan McLellan <btm@getchef.com> Bryan McLellan <bryan.mclellan@webtrends.com> -Bryan McLellan <btm@getchef.com> Bryan McLellan <btm@opscode.com> -Bryan McLellan <btm@getchef.com> Bryan McLellan <btm@loftninjas.org> -Bryan McLellan <btm@getchef.com> Bryan McLellan <bryanm@widemile.com> +Bryan McLellan <btm@chef.io> Bryan McLellan <btm@getchef.com> +Bryan McLellan <btm@chef.io> Bryan McLellan <bryan.mclellan@webtrends.com> +Bryan McLellan <btm@chef.io> Bryan McLellan <btm@opscode.com> +Bryan McLellan <btm@chef.io> Bryan McLellan <btm@loftninjas.org> +Bryan McLellan <btm@chef.io> Bryan McLellan <bryanm@widemile.com> # Lamont Granquist -Lamont Granquist <lamont@getchef.com> -Lamont Granquist <lamont@getchef.com> lamont-opscode <lamont@opscode.com> -Lamont Granquist <lamont@getchef.com> Lamont Granquist <lamont@opscode.com> -Lamont Granquist <lamont@getchef.com> Lamont Granquist <lamont@scriptkiddie.org> -Lamont Granquist <lamont@getchef.com> lamont-granquist <lamont@scriptkiddie.org> +Lamont Granquist <lamont@chef.io> Lamont Granquist <lamont@getchef.com> +Lamont Granquist <lamont@chef.io> lamont-opscode <lamont@opscode.com> +Lamont Granquist <lamont@chef.io> Lamont Granquist <lamont@opscode.com> +Lamont Granquist <lamont@chef.io> Lamont Granquist <lamont@scriptkiddie.org> +Lamont Granquist <lamont@chef.io> lamont-granquist <lamont@scriptkiddie.org> # Serdar Sutay -Serdar Sutay <serdar@opscode.com> -Serdar Sutay <serdar@opscode.com> sersut <serdar@opscode.com> +Serdar Sutay <serdar@chef.io> Serdar Sutay <serdar@opscode.com> +Serdar Sutay <serdar@chef.io> sersut <serdar@opscode.com> +Serdar Sutay <serdar@chef.io> ssutay <serdar@opscode.com> # Claire McQuin -Claire McQuin <claire@getchef.com> -Claire McQuin <claire@getchef.com> Claire McQuin <mcquin@users.noreply.github.com> -Claire McQuin <claire@getchef.com> Claire McQuin <claire@opscode.com> -Claire McQuin <claire@getchef.com> Claire McQuin <clairemcquin@seamcquin01.local> +Claire McQuin <claire@chef.io> Claire McQuin <claire@getchef.com> +Claire McQuin <claire@chef.io> Claire McQuin <mcquin@users.noreply.github.com> +Claire McQuin <claire@chef.io> Claire McQuin <claire@opscode.com> +Claire McQuin <claire@chef.io> Claire McQuin <clairemcquin@seamcquin01.local> # John Keiser -John Keiser <jkeiser@opscode.com> -John Keiser <jkeiser@opscode.com> jkeiser <jkeiser@opscode.com> -John Keiser <jkeiser@opscode.com> John Keiser <john@johnkeiser.com> -John Keiser <jkeiser@opscode.com> John Keiser <johnkeiser@John-Keisers-MacBook-Pro.local> +John Keiser <jkeiser@chef.io> John Keiser <jkeiser@opscode.com> +John Keiser <jkeiser@chef.io> jkeiser <jkeiser@opscode.com> +John Keiser <jkeiser@chef.io> John Keiser <john@johnkeiser.com> +John Keiser <jkeiser@chef.io> John Keiser <johnkeiser@John-Keisers-MacBook-Pro.local> # Seth Chisamore -Seth Chisamore <schisamo@getchef.com> -Seth Chisamore <schisamo@getchef.com> Seth Chisamore <schisamo@opscode.com> +Seth Chisamore <schisamo@chef.io> Seth Chisamore <schisamo@getchef.com> +Seth Chisamore <schisamo@chef.io> Seth Chisamore <schisamo@opscode.com> # Joshua Timberman -Joshua Timberman <joshua@opscode.com> -Joshua Timberman <joshua@opscode.com> Joshua Timberman <jtimberman@cider.local> -Joshua Timberman <joshua@opscode.com> Joshua Timberman <jtimberman@users.noreply.github.com> -Joshua Timberman <joshua@opscode.com> jtimberman <joshua.timberman@gmail.com> -Joshua Timberman <joshua@opscode.com> jtimberman <joshua@opscode.com> -Joshua Timberman <joshua@opscode.com> jtimberman <jtimberman@www1test.housepub.org> +Joshua Timberman <joshua@chef.io> jtimberman <joshua@chef.io> +Joshua Timberman <joshua@chef.io> Joshua Timberman <joshua@opscode.com> +Joshua Timberman <joshua@chef.io> Joshua Timberman <jtimberman@cider.local> +Joshua Timberman <joshua@chef.io> Joshua Timberman <jtimberman@users.noreply.github.com> +Joshua Timberman <joshua@chef.io> jtimberman <joshua.timberman@gmail.com> +Joshua Timberman <joshua@chef.io> jtimberman <joshua@opscode.com> +Joshua Timberman <joshua@chef.io> jtimberman <jtimberman@www1test.housepub.org> # Nuo Yan Nuo Yan <nuo@opscode.com> @@ -66,28 +69,28 @@ Thom May <thom@clearairturbulence.org> Thom May <thom@virelais.nyc.joostas.com> Thom May <thom@clearairturbulence.org> Thom May <tmay@expedia.com> # Stephen Delano -Stephen Delano <stephen@opscode.com> -Stephen Delano <stephen@opscode.com> Stephen Delano <stephen@opscode-stephen.(none)> -Stephen Delano <stephen@opscode.com> Stephen Delano <stephen@opscode-stephen.local> -Stephen Delano <stephen@opscode.com> sdelano <stephen@opscode.com> +Stephen Delano <stephen@chef.io> Stephen Delano <stephen@opscode.com> +Stephen Delano <stephen@chef.io> Stephen Delano <stephen@opscode-stephen.(none)> +Stephen Delano <stephen@chef.io> Stephen Delano <stephen@opscode-stephen.local> +Stephen Delano <stephen@chef.io> sdelano <stephen@opscode.com> # AJ Christensen AJ Christensen <aj@opscode.com> AJ Christensen <aj@opscode.com> AJ Christensen <aj@junglist.gen.nz> # Seth Falcon -Seth Falcon <seth@opscode.com> -Seth Falcon <seth@opscode.com> Seth Falcon <sethfalcon@gmail.com> +Seth Falcon <seth@chef.io> Seth Falcon <seth@opscode.com> +Seth Falcon <seth@chef.io> Seth Falcon <sethfalcon@gmail.com> # Adam Edwards -Adam Edwards <adamed@opscode.com> -Adam Edwards <adamed@opscode.com> adamedx <adamed@getchef.com> -Adam Edwards <adamed@opscode.com> adamedx <adamed@opscode.com> -Adam Edwards <adamed@opscode.com> adamedx <admed@opscode.com> +Adam Edwards <adamed@chef.io> Adam Edwards <adamed@opscode.com> +Adam Edwards <adamed@chef.io> adamedx <adamed@getchef.com> +Adam Edwards <adamed@chef.io> adamedx <adamed@opscode.com> +Adam Edwards <adamed@chef.io> adamedx <admed@opscode.com> # Prajakta Purohit -Prajakta Purohit <prajakta@opscode.com> -Prajakta Purohit <prajakta@opscode.com> PrajaktaPurohit <prajakta@opscode.com> +Prajakta Purohit <prajakta@chef.io> Prajakta Purohit <prajakta@opscode.com> +Prajakta Purohit <prajakta@chef.io> PrajaktaPurohit <prajakta@opscode.com> kaustubh-d <kaustubh@clogeny.com> kaustubh-d <kaustubh@clogeny.com> kaustubh <kaustubh.deo@gmail.com> @@ -101,4 +104,14 @@ Xabier de Zuazo <xabier@onddo.com> Xabier de Zuazo <xabier@zuazo.org> # Tim Hinderliter Tim Hinderliter <tim@opscode.com> Tim Hinderliter <tim@opscode.com> tim@opscode.com <tim@opscode.com> -Tim Hinderliter <tim@opscode.com> timh <tim@opscode.com>
\ No newline at end of file +Tim Hinderliter <tim@opscode.com> timh <tim@opscode.com> + +# Mark Paradise +Marc Paradise <marc@chef.io> Marc Paradise <marc@opscode.com> +Marc Paradise <marc@chef.io> marc@opscode.com <marc@opscode.com> + +# Tyler Ball +Tyler Ball <tyleraball@gmail.com> tyler-ball <tyleraball@gmail.com> + +# Steven Danna +Steven Danna <steve@chef.io> Steven Danna <steve@opscode.com>
\ No newline at end of file |