diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-08-29 15:31:05 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-08-29 15:31:05 -0400 |
| commit | 3d11fd9fd50714617b7bac7c4c068aa4e369701b (patch) | |
| tree | bfe3531d0f546ac3338d18654d8b1f5f4bc89f1d /AUTHORS | |
| parent | 140c367cb9a913c76fbe02e66da0f14badc50f99 (diff) | |
| parent | 1139d5eee52c75dbf10fa11d3644d5c4a37de7b6 (diff) | |
| download | cobbler-3d11fd9fd50714617b7bac7c4c068aa4e369701b.tar.gz cobbler-3d11fd9fd50714617b7bac7c4c068aa4e369701b.tar.xz cobbler-3d11fd9fd50714617b7bac7c4c068aa4e369701b.zip | |
Merge branch 'devel'
Conflicts:
AUTHORS
CHANGELOG
cobbler.spec
cobbler/api.py
cobbler/remote.py
cobbler/services.py
cobbler/utils.py
setup.py
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -7,12 +7,18 @@ Cobbler is written & maintained by: Patches and other contributions from: + Joseph Boyer Jr. <jboyer@liquidnet.com> David Brown <dmlb2000@gmail.com> James Bowes <jbowes@redhat.com> + James Cammarata <jimi@sgnx.net> + Carsten Clasohm <cclasohm@redhat.com> C. Daniel Chase <dan@cdchase.com> Carsten Clasohm <clasohm@redhat.com> + Charles Duffy <charles_duffy@messageone.com> Máirín Duffy <duffy@redhat.com> John Eckersberg <jeckersb@redhat.com> + Dan Guernsey <danpg102@gmail.com> + Dave Hatton <dave@davehatton.it> Scott Henson <shenson@redhat.com> Tru Huynh <tru@pasteur.fr> Matt Hyclak <hyclak@math.ohiou.edu> @@ -23,10 +29,12 @@ Patches and other contributions from: David Lutterkort <dlutter@redhat.com> Bryan Mason' <bjmason@redhat.com> Lester M. <needwork@gmail.com> + Bryan Mason' <bjmason@redhat.com> Sean Millichamp <sean@bruenor.org> Jim Meyering <jim@meyering.net> Perry Myers <pmyers@redhat.com> Jack Neely <jjneely@ncsu.edu> + Lassi Pölönen <lassi.polonen@helsinki.fi> Ben Riggs <rigg0022@umn.edu> Jeremy Rosengren <jeremy@rosengren.org> Adam Rosenwald <thestrider@gmail.com> @@ -34,6 +42,8 @@ Patches and other contributions from: Scott Seago <sseago@redhat.com> Al Tobey <tobert@gmail.com> Ronald van den Blink <ronald@a61.nl> + Thomas Uhde <thomas.uhde@KabelDeutschland.de> + John L. Villalovos <john@sodarock.com> Tim Verhoeven <tim.verhoeven.be@gmail.com> [...send patches to get your name here...] |