aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorAdam Stokes <adam.stokes@ubuntu.com>2013-11-06 00:04:06 -0500
committerAdam Stokes <adam.stokes@ubuntu.com>2013-11-06 00:04:06 -0500
commitfb2823b9ebf67ad9689eaeb766aa301a0caa4ab2 (patch)
treed4e28586a2879df720f5407075df413520a3b203 /AUTHORS
parentce1935a242beea01f7bffecc4377e9e8ab27f96c (diff)
parent0ff6200d0b6f6d38d09eed49b1ec9fd55eb38a91 (diff)
downloadsos-fb2823b9ebf67ad9689eaeb766aa301a0caa4ab2.tar.gz
Merge branch 'master' into py33
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS7
1 files changed, 7 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 90b3198b..5c9a3332 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,15 +2,20 @@ Individuals
-----------
Adam Stokes <adam.stokes@ubuntu.com>
Ben Turner <bturner@redhat.com>
+Bharani C.V. <bharanve@linux.vnet.ibm.com>
+Brent Eagles <beagles@redhat.com>
Bryn M. Reeves <bmr@redhat.com>
Chris J Arges <chris.j.arges@ubuntu.com>
Eoghan Glynn <eglynn@redhat.com>
Eric Williams <eric.williams@canonical.com>
Eugene Teo <eteo@redhat.com>
+Flavio Percoco <fpercoco@redhat.com>
Gary Kotton <gkotton@redhat.com>
+Guy Streeter <streeter@redhat.com>
James Hunt <james.hunt@ubuntu.com>
Jeff Dutton <jeff.r.dutton@gmail.com>
Jeff Peeler <jpeeler@redhat.com>
+Jeremy Agee <jagee@redhat.com>
Jesse Jaggars <jjaggars@redhat.com>
Joey Boggs <jboggs@redhat.com>
John Berninger <jwb@redhat.com>
@@ -28,6 +33,7 @@ Sadique Puthen <sputhenp@redhat.com>
Shijoe George <spanjikk@redhat.com>
Steve Conklin <sconklin@redhat.com>
Tomas Smetana <tsmetana@redhat.com>
+Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Companies
---------
@@ -35,3 +41,4 @@ Red Hat, Inc.
Rackspace US, Inc.
EMC Corporation
Canonical Ltd.
+IBM Corporation