diff --git a/modules/ROOT/pages/about.adoc b/modules/ROOT/pages/about.adoc index 725d0bf..3f0f1f9 100644 --- a/modules/ROOT/pages/about.adoc +++ b/modules/ROOT/pages/about.adoc @@ -20,7 +20,7 @@ to each other, allowing for more collaboration between them, and where we can, we try and share services and ideas to better both our communities. -There are approximately 40 people on this consolidated +There are approximately 20 people on this consolidated team and we take a fluid approach to how we staff initiatives. The breakdown looks approximately like this: @@ -29,15 +29,13 @@ The breakdown looks approximately like this: ** 10 software engineers ** 1 person dedicated to documentation ** 1 design-centric engineer + ** 2 system administrators + ** 2 release engineers -* In CentOS: - ** 8 software engineers +* In CentOS Stream: + ** 1 System Administrator + ** 1 software engineer -* There are 10 system administrators, Ops centric engineers, -and software engineers working in Infrastructure & Release -Engineering for CentOS Stream and Fedora where they help keep -the lights on. - * There are also 4 Red Hat Interns working with us. * The team is also helped and coordinated by: diff --git a/modules/ROOT/pages/meet_the_team.adoc b/modules/ROOT/pages/meet_the_team.adoc index 1ecd336..79d6b0d 100644 --- a/modules/ROOT/pages/meet_the_team.adoc +++ b/modules/ROOT/pages/meet_the_team.adoc @@ -7,46 +7,29 @@ |=== -a|image::/trading_cards/current/Abaz Bajrami.png[] a|image::/trading_cards/current/Adam Piasecki.png[] a|image::/trading_cards/current/Adam Saleh.png[] a|image::/trading_cards/current/Akashdeep Dhar.png[] a|image::/trading_cards/current/Ant Carroll.png[] - a|image::/trading_cards/current/Anton Medvedev.png[] -a|image::/trading_cards/current/Aoife Moloney.png[] -a|image::/trading_cards/current/Aurelien Bompard.png[] -a|image::/trading_cards/current/Camila Granella.png[] -a|image::/trading_cards/current/Carl George.png[] -a|image::/trading_cards/current/David Fan.png[] +a|image::/trading_cards/current/Aurelien Bompard.png[] +a|image::/trading_cards/current/Carl George.png[] a|image::/trading_cards/current/David Kirwin.png[] a|image::/trading_cards/current/Diego Herrera.png[] a|image::/trading_cards/current/Emma Kidney.png[] -a|image::/trading_cards/current/Fabian Arrotin.png[] +a|image::/trading_cards/current/Fabian Arrotin.png[] a|image::/trading_cards/current/James Richardson.png[] -a|image::/trading_cards/current/Jess Chitas.png[] a|image::/trading_cards/current/Julia Bley.png[] a|image::/trading_cards/current/Kevin Fenzi.png[] -a|image::/trading_cards/current/Leigh Griffin.png[] - a|image::/trading_cards/current/Lenka Segura.png[] -a|image::/trading_cards/current/Leonardo Rossetti.png[] -a|image::/trading_cards/current/Mark O'Brien.png[] -a|image::/trading_cards/current/Martin McConnell.png[] -a|image::/trading_cards/current/Michal Konecny.png[] -a|image::/trading_cards/current/Mohan Boddu.png[] -a|image::/trading_cards/current/Niall Crowe.png[] +a|image::/trading_cards/current/Michal Konecny.png[] a|image::/trading_cards/current/Nils Philippsen.png[] a|image::/trading_cards/current/Petr Bokoc.png[] -a|image::/trading_cards/current/Pierre-Yves Chibon.png[] a|image::/trading_cards/current/Ryan Lerch.png[] -a|image::/trading_cards/current/Sarah Finn.png[] -a|image::/trading_cards/current/Stefan Mattejiet.png[] -a|image::/trading_cards/current/Stephen Smoogen.png[] a|image::/trading_cards/current/Tomas Hrcka.png[] |=== @@ -59,6 +42,7 @@ a|image::/trading_cards/current/Tomas Hrcka.png[] a|image::/trading_cards/current/Madeline Peck.png[138,192] a|image::/trading_cards/current/Mairin Duffy.png[138,192] +a|image::/trading_cards/current/Aoife Moloney.png[] |=== @@ -68,7 +52,24 @@ a|image::/trading_cards/current/Mairin Duffy.png[138,192] |=== +a|image::/trading_cards/current/Abaz Bajrami.png[] +a|image::/trading_cards/current/Camila Granella.png[] +a|image::/trading_cards/current/David Fan.png[] +a|image::/trading_cards/current/Jess Chitas.png[] +a|image::/trading_cards/current/Leigh Griffin.png[] + +a|image::/trading_cards/current/Leonardo Rossetti.png[] +a|image::/trading_cards/current/Mark O'Brien.png[] +a|image::/trading_cards/current/Martin McConnell.png[] +a|image::/trading_cards/current/Mohan Boddu.png[] +a|image::/trading_cards/current/Niall Crowe.png[] + +a|image::/trading_cards/current/Pierre-Yves Chibon.png[] +a|image::/trading_cards/current/Sarah Finn.png[] +a|image::/trading_cards/current/Stefan Mattejiet.png[] +a|image::/trading_cards/current/Stephen Smoogen.png[] a|image::/trading_cards/retired/Stephen Coady.png[138,192] + a|image::/trading_cards/retired/Vipul Siddharth.png[138,192] -|=== \ No newline at end of file +|===