summaryrefslogtreecommitdiffstats
path: root/doc/appendix/contributors.txt
diff options
context:
space:
mode:
authorFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
committerFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
commit875aefd9beb9e7fd464348c0e0fa42896dc329ff (patch)
tree6c9920648f7c56a9a5854c1dafa474d8e8139508 /doc/appendix/contributors.txt
parentf5792d907e357c90624ec110d908d42b94296a12 (diff)
parent71bb583ac04ff1c52e03d69a91bbb508783566f8 (diff)
downloadbcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.gz
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.bz2
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/appendix/contributors.txt')
-rw-r--r--doc/appendix/contributors.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/appendix/contributors.txt b/doc/appendix/contributors.txt
index 88246b513..eaf4aa29a 100644
--- a/doc/appendix/contributors.txt
+++ b/doc/appendix/contributors.txt
@@ -1,6 +1,6 @@
.. -*- mode: rst -*-
-.. _AUTHORS: http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/AUTHORS
+.. _AUTHORS: http://trac.mcs.anl.gov/projects/bcfg2/browser/AUTHORS
.. _MCS: http://www.mcs.anl.gov/
.. _appendix-contributors:
@@ -9,7 +9,7 @@
Contributors
============
-..
+..
This is list is no longer in chronological order like the
AUTHORS file because it's easier to maintain (for me).
Automatically sorted.
@@ -22,7 +22,7 @@ In alphabetical order of the given name:
- Daniel Clark <dclark@pobox.com> created encap packages for bcfg2 and deps, wrote fossil-scm dvcs support, and helps with Debian packaging
- Danny Clark enabled the Encap packaging
- David Dahl worked on Hostbase
-- David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support
+- David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support
- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of the bcfg client and server and implemented a common logging infrastructure.
- Fabian Affolter <fabian@bernewireless.net> made some patches and worked on the manual
- Jason Pepas <cell@ices.utexas.edu> has written a RPM package list creator has contributed patches to the Red Hat toolset
@@ -37,7 +37,8 @@ In alphabetical order of the given name:
- Sami Haahtinen <ressu@ressukka.net> has written Debian packaging logic.
- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written the VHost plugin
- Scott Matott
-- Sol Jerome <solj@ices.utexas.edu> squashes bugs, helps manage the project roadmap, and implements various interesting features.
+- Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
+ project roadmap, and implements various interesting features.
- Ti Leggett worked on ebuild packaging and bugfixes, RPM packaging
- Zach Lowry Solaris support and general hardening
@@ -49,5 +50,4 @@ throughout this project. Philip Steinbachs provided detailed
feedback as an early external user.
The most updated listing is available in the AUTHORS_ file in the
-SVN :term:`repository` of Bcfg2.
-
+git :term:`repository` for Bcfg2.