svn commit: r240437 - stable/7/share/misc

Thu Sep 13 01:02:57 UTC 2012

Author: eadler
Date: Thu Sep 13 01:02:56 2012
New Revision: 240437
URL: http://svn.freebsd.org/changeset/base/240437

Log:
  MFC r237676,r237677,r237680,r240294,r240318,r240324:
  	Update organization.dot to reflect reality
  
  Approved by:	cperciva (implicit)

Modified:
  stable/7/share/misc/organization.dot
Directory Properties:
  stable/7/share/misc/   (props changed)

Modified: stable/7/share/misc/organization.dot
==============================================================================

--- stable/7/share/misc/organization.dot	Thu Sep 13 01:02:56 2012	(r240436)
+++ stable/7/share/misc/organization.dot	Thu Sep 13 01:02:56 2012	(r240437)
@@ -26,21 +26,15 @@ _misc [label="Miscellaneous Hats"]
 # Development teams go here alphabetically sorted
 
 core [label="Core Team\ncore at FreeBSD.org\nwilko, brooks, keramida, imp,\ngnn, wes, hrs, murray,\nrwatson"]
-coresecretary [label="Core Team Secretary\ncore-secretary at FreeBSD.org\njoel"]
+coresecretary [label="Core Team Secretary\ncore-secretary at FreeBSD.org\npgj"]
 doccommitters [label="Doc/www Committers\ndoc-committers at FreeBSD.org"]
-doceng [label="Documentation Engineering Team\ndoceng at FreeBSD.org\nnik, blackend, hrs,\nkeramida"]
+doceng [label="Documentation Engineering Team\ndoceng at FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers at FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr at FreeBSD.org\nmarcus, kris, erwin,\nlinimon, pav, krion"]
-portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\nerwin"]
-re [label="Primary Release Engineering Team\nre at FreeBSD.org\nmux, bmah, hrs, kensmith,\nmurray, rwatson, dwhite"]
-realpha [label="FreeBSD/alpha Release Engineering Team\nre-alpha at FreeBSD.org\nwilko, murray, rwatson"]
-reamd64 [label="FreeBSD/amd64 Release Engineering Team\nre-amd64 at FreeBSD.org\nobrien"]
-rei386 [label="FreeBSD/i386 Release Engineering Team\nre-i386 at FreeBSD.org\nmurray, rwatson"]
-reia64 [label="FreeBSD/ia64 Release Engineering Team\nre-ia64 at FreeBSD.org\nmarcel"]
-repc98 [label="FreeBSD/pc98 Release Engineering Team\nre-pc98 at FreeBSD.org\nnyan"]
-reppc [label="FreeBSD/ppc Release Engineering Team\nre-ppc at FreeBSD.org\ngrehan"]
-resparc64 [label="FreeBSD/sparc64 Release Engineering Team\nre-sparc64 at FreeBSD.org\njake, phk, tmm, obrien,\nkensmith, murray, rwatson"]
-secteam [label="Security Team\nsecteam at FreeBSD.org\nmnag, remko, gnn, simon, philip,\ncperciva, csjp, des,\nnectar, rwatson"]
+portmgr [label="Port Management Team\nportmgr at FreeBSD.org\ntabthorpe, marcus, bapt, beat,\nerwin, linimon, pav,\nitetcu, miwi"]
+portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\ntabthorpe"]
+re [label="Primary Release Engineering Team\nre at FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith,\nrwatson, bz"]
+secteam [label="Security Team\nsecteam at FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
+portssecteam [label="Ports Security Team\nports-secteam at FreeBSD.org\nmiwi, rea, swills, wxs,\njgh, sbz, eadler, zi, remko, simon"]
 secteamsecretary [label="Security Team Secretary\nsecteam-secretary at FreeBSD.org\nremko"]
 securityofficer [label="Security Officer Team\nsecurity-officer at FreeBSD.org\ncperciva, simon, nectar"]
 srccommitters [label="Src Committers\nsrc-committers at FreeBSD.org"]
@@ -49,24 +43,23 @@ srccommitters [label="Src Committers\nsr
 
 accounts [label="Accounts Team\naccounts at FreeBSD.org\nmarkm, simon, kensmith,\ndhw"]
 backups [label="Backup Administrators\nbackups at FreeBSD.org\nsimon, kensmith,\ndhw"]
-bugmeister [label="Bugmeister Team\nbugmeister at FreeBSD.org\nceri, linimon, remko"]
-clusteradm [label="Cluster Administrators\nclusteradm at FreeBSD.org\nbillf, simon, ps,\nkensmith, peter"]
+bugmeister [label="Bugmeister Team\nbugmeister at FreeBSD.org\neadler, gavin, gonzo, linimon"]
+clusteradm [label="Cluster Administrators\nclusteradm at FreeBSD.org\nbrd, simon, ps,\nkensmith, peter"]
 cvsupmaster [label="CVSup Mirror Site Coordinators\ncvsup-master at FreeBSD.org\nkuriyama, jdp,\nkensmith"]
-dcvs [label="CVS doc/www Repository Managers\ndcvs at FreeBSD.org\njoe, kuriyama, markm,\nsimon"]
 dnsadm [label="DNS Administrators\ndnsadm at FreeBSD.org\nbillf, dg, ps,\nkensmith, peter"]
 mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-admin at FreeBSD.org\nkuriyama, kensmith"]
 ncvs [label="CVS src Repository Managers\nncvs at FreeBSD.org\njoe, kuriyama, markm,\nsimon, peter"]
 pcvs [label="CVS ports Repository Managers\npcvs at FreeBSD.org\nmarcus, joe, kuriyama,\nmarkm, simon"]
 perforceadmin [label="Perforce Repository Administrators\nperforce-admin at FreeBSD.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"]
-postmaster [label="Postmaster Team\npostmaster at FreeBSD.org\njmb, brd, dhw"]
+postmaster [label="Postmaster Team\npostmaster at FreeBSD.org\njmb, brd, sahil, dhw"]
 refadm [label="Reference Systems Administrators\nrefadm at FreeBSD.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"]
 webmaster [label="Webmaster Team\nwebmaster at FreeBSD.org\nnik, kuriyama, simon,\njesusr, wosch"]
 
 # Misc hats go here alphabetically sorted
 
-donations [label="Donations Team\ndonations at FreeBSD.org\nwilko, brueffer,\nobrien, trhodes, ds,\nrwatson"]
+donations [label="Donations Team\ndonations at FreeBSD.org\ngjb, wilko, gahr, pgolluci,\nobrien, trhodes, ds,\nrwatson"]
 marketing [label="Marketing Team\nmarketing at FreeBSD.org\nSteven Beedle, Denise Ebery, deb,\njkoshy, Dru Lavigne, mwlucas, imp,\nKris Moore, murray, mattt,\nJeremy C. Reed, rwatson"]
-vendorrelations [label="Vendor Relations Team\nvendor-relations at FreeBSD.org\nbrueffer, gioria, jmg, rik,\nphilip, hmp, marks,\nmurray"]
+vendorrelations [label="Vendor Relations Team\nvendor-relations at FreeBSD.org\ngioria, jmg, rik,\nphilip, hmp, marks,\nmurray"]
 
 # Here are the team relationships.
 # Group together all the entries for the superior team.
@@ -105,15 +98,8 @@ doceng -> doccommitters
 portmgr -> portmgrsecretary
 portmgr -> portscommitters
 
-re -> realpha
-re -> reamd64
-re -> rei386
-re -> reia64
-re -> repc98
-re -> reppc
-re -> resparc64
-
 securityofficer -> secteam
+securityofficer -> portssecteam
 
 secteam -> secteamsecretary
 
