Explorar o código

Merge pull request #246 from titanous/update-authors

Update AUTHORS and add .mailmap
Solomon Hykes %!s(int64=12) %!d(string=hai) anos
pai
achega
b67fe1ecb9
Modificáronse 2 ficheiros con 52 adicións e 14 borrados
  1. 16 0
      .mailmap
  2. 36 14
      AUTHORS

+ 16 - 0
.mailmap

@@ -0,0 +1,16 @@
+# Generate AUTHORS: git log --all --format='%aN <%aE>' | sort -uf | grep -v vagrant-ubuntu-12
+<charles.hooper@dotcloud.com> <chooper@plumata.com> 
+<daniel.mizyrycki@dotcloud.com> <daniel@dotcloud.com>
+<daniel.mizyrycki@dotcloud.com> <mzdaniel@glidelink.net>
+Guillaume J. Charmes <guillaume.charmes@dotcloud.com> creack <charmes.guillaume@gmail.com>
+<guillaume.charmes@dotcloud.com> <guillaume@dotcloud.com>
+<kencochrane@gmail.com> <KenCochrane@gmail.com>
+<sridharr@activestate.com> <github@srid.name>
+Thatcher Peskens <thatcher@dotcloud.com> dhrp <thatcher@dotcloud.com>
+Thatcher Peskens <thatcher@dotcloud.com> dhrp <thatcher@gmx.net>
+Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> jpetazzo <jerome.petazzoni@dotcloud.com>
+Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> <jp@enix.org>
+Joffrey F <joffrey@dotcloud.com>
+<joffrey@dotcloud.com> <f.joffrey@gmail.com>
+Tim Terhorst <mynamewastaken+git@gmail.com>
+Andy Smith <github@anarkystic.com>

+ 36 - 14
AUTHORS

@@ -1,14 +1,36 @@
-Solomon Hykes
-Sam Alba
-Jérôme Petazzoni
-Andrea Luzzardi
-Joffrey Fuhrer
-Louis Opter
-Niall O'Higgins
-Brian McCallister
-Jeff Lindsay
-Ken Cochrane
-Charles Hooper
-Guillaume Charmes
-Daniel Mizyrycki
-John Costa
+Andrea Luzzardi <aluzzardi@gmail.com>
+Andy Rothfusz <github@metaliveblog.com>
+Andy Smith <github@anarkystic.com>
+Antony Messerli <amesserl@rackspace.com>
+Brian McCallister <brianm@skife.org>
+Caleb Spare <cespare@gmail.com>
+Charles Hooper <charles.hooper@dotcloud.com>
+Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com>
+Daniel Robinson <gottagetmac@gmail.com>
+Don Spaulding <donspauldingii@gmail.com>
+ezbercih <cem.ezberci@gmail.com>
+Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
+Guillaume J. Charmes <guillaume.charmes@dotcloud.com>
+Hunter Blanks <hunter@twilio.com>
+Jeff Lindsay <progrium@gmail.com>
+Jeremy Grosser <jeremy@synack.me>
+Joffrey F <joffrey@dotcloud.com>
+John Costa <john.costa@gmail.com>
+Jonathan Rudenberg <jonathan@titanous.com>
+Julien Barbier <write0@gmail.com>
+Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>
+Ken Cochrane <kencochrane@gmail.com>
+Louis Opter <kalessin@kalessin.fr>
+Mikhail Sobolev <mss@mawhrin.net>
+Nelson Chen <crazysim@gmail.com>
+Niall O'Higgins <niallo@unworkable.org>
+Piotr Bogdan <ppbogdan@gmail.com>
+Sam Alba <sam.alba@gmail.com>
+Shawn Siefkas <shawn.siefkas@meredith.com>
+Silas Sewell <silas@sewell.org>
+Solomon Hykes <solomon@dotcloud.com>
+Sridhar Ratnakumar <sridharr@activestate.com>
+Thatcher Peskens <thatcher@dotcloud.com>
+Tim Terhorst <mynamewastaken+git@gmail.com>
+Troy Howard <thoward37@gmail.com>
+Vivek Agarwal <me@vivek.im>