From 3c64a19ec6cfc32eaae8075ff4f6055c34e626b8 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 25 Jul 2024 15:03:11 -0500 Subject: [PATCH 1/2] Update Mail Map for 0.1.74 --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 7387879af87..18c25954053 100644 --- a/.mailmap +++ b/.mailmap @@ -26,6 +26,9 @@ Matthew Burket Frank Caviggia +Dan Clark +Dan Clark + Will Cushen <54533890+wcushen@users.noreply.github.com> Jean-Baptiste Donnette From 316fb4d7c1f70763ea4701dddc4cb6dea4ac6a6e Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 25 Jul 2024 15:03:47 -0500 Subject: [PATCH 2/2] Update Contributors for v0.1.74 --- Contributors.md | 20 ++++++++++++++------ Contributors.xml | 19 +++++++++++++------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Contributors.md b/Contributors.md index 8552aa8b08a..7eee94eb1ff 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,5 +1,5 @@ The following people have contributed to the SCAP Security Guide project @@ -8,6 +8,7 @@ The following people have contributed to the SCAP Security Guide project * Frank J Cameron (CAM1244) * 0x66656c6978 <0x66656c6978@users.noreply.github.com> * Håvard F. Aasen +* Armando Acosta * Jack Adolph * Edgar Aguilar * akuster @@ -19,14 +20,14 @@ The following people have contributed to the SCAP Security Guide project * angystardust * anivan-suse * anixon-rh <55244503+anixon-rh@users.noreply.github.com> -* Stephen L Arnold +* Steve Arnold * Ikko Ashimine * Chuck Atkins * Bharath B * Ryan Ballanger * Alex Baranowski * Eduardo Barretto -* Paul Bastide +* Paul Bastide * Molly Jo Bault * Andrew Becker * Gabriel Becker @@ -55,6 +56,7 @@ The following people have contributed to the SCAP Security Guide project * David du Colombier * Commandcracker * Caleb Cooper +* CoreyCook8 <129206271+CoreyCook8@users.noreply.github.com> * cortesana * Richard Maciel Costa * Xavier Coulon @@ -81,6 +83,7 @@ The following people have contributed to the SCAP Security Guide project * Alexis Facques * Henry Finucane * Leah Fisher +* Marco Fortina * Yavor Georgiev * Alijohn Ghassemlouei * Swarup Ghosh @@ -102,8 +105,10 @@ The following people have contributed to the SCAP Security Guide project * Trey Henefield * Henning Henkel * hex2a +* hipponix * John Hooks * Jakub Hrozek +* Donald Hunter * De Huo * Robin Price II * Yasir Imam @@ -167,9 +172,11 @@ The following people have contributed to the SCAP Security Guide project * Zbynek Moravec * Kazuo Moriwaka * Michael Moseley +* Nathan Moyer * Ross Murphy * Renaud Métrich * Joe Nall +* namoyer10 <48189779+namoyer10@users.noreply.github.com> * Neiloy * Axel Nennker * Michele Newman @@ -219,11 +226,11 @@ The following people have contributed to the SCAP Security Guide project * Chris Ruffalo * Benjamin Ruland * rumch-se <77793453+rumch-se@users.noreply.github.com> -* Rutvik <32413084+rutvik23@users.noreply.github.com> -* rutvik23 +* Rutvik * Ray Shaw (Cont ARL/CISD) rvshaw * Earl Sampson * sampsone +* Mirco Santori * Willy Santos * Nagarjuna Sarvepalli * Anderson Sasaki <33833274+ansasaki@users.noreply.github.com> @@ -277,7 +284,7 @@ The following people have contributed to the SCAP Security Guide project * vtrubovics <82443408+vtrubovics@users.noreply.github.com> * Samuel Warren * wcushen <54533890+wcushen@users.noreply.github.com> -* Shawn Wells +* Shawn Wells * Whidix <31294015+Whidix@users.noreply.github.com> * Daniel E. White * Bernhard M. Wiedemann @@ -285,6 +292,7 @@ The following people have contributed to the SCAP Security Guide project * Willumpie * Rob Wilmoth * win97pro +* wqian * Lucas Yamanishi * Xirui Yang * Yuqing Yang diff --git a/Contributors.xml b/Contributors.xml index f60151b8ff8..10294049fe8 100644 --- a/Contributors.xml +++ b/Contributors.xml @@ -1,11 +1,12 @@ Frank J Cameron (CAM1244) <cameron@ctc.com> 0x66656c6978 <0x66656c6978@users.noreply.github.com> Håvard F. Aasen <havard.f.aasen@pfft.no> +Armando Acosta <armando.acosta@oracle.com> Jack Adolph <jack.adolph@gmail.com> Edgar Aguilar <edgar.aguilar@oracle.com> akuster <akuster808@gmail.com> @@ -17,14 +18,14 @@ Last Modified: 2024-04-25 11:09 UTC angystardust <angystardust@users.noreply.github.com> anivan-suse <anastasija.ivanovic@suse.com> anixon-rh <55244503+anixon-rh@users.noreply.github.com> -Stephen L Arnold <sarnold@vctlabs.com> +Steve Arnold <sarnold@vctlabs.com> Ikko Ashimine <eltociear@gmail.com> Chuck Atkins <chuck.atkins@kitware.com> Bharath B <bhb@redhat.com> Ryan Ballanger <root@rballang-admin-2.fastenal.com> Alex Baranowski <alex@euro-linux.com> Eduardo Barretto <eduardo.barretto@canonical.com> -Paul Bastide <pbastide@redhat.com> +Paul Bastide <pbastide@us.ibm.com> Molly Jo Bault <Molly.Jo.Bault@ballardtech.com> Andrew Becker <A-Beck@users.noreply.github.com> Gabriel Becker <ggasparb@redhat.com> @@ -80,6 +81,7 @@ Last Modified: 2024-04-25 11:09 UTC Alexis Facques <alexis.facques@mythalesgroup.io> Henry Finucane <hfinucane@zscaler.com> Leah Fisher <lfisher047@gmail.com> +Marco Fortina <marco_fortina@hotmail.it> Yavor Georgiev <strandjata@gmail.com> Alijohn Ghassemlouei <alijohn@secureagc.com> Swarup Ghosh <swghosh@redhat.com> @@ -101,8 +103,10 @@ Last Modified: 2024-04-25 11:09 UTC Trey Henefield <thenefield@gmail.com> Henning Henkel <henning.henkel@helvetia.ch> hex2a <hex2a@users.noreply.github.com> +hipponix <mirco.santori@gmail.com> John Hooks <jhooks@starscream.pa.jhbcomputers.com> Jakub Hrozek <jhrozek@redhat.com> +Donald Hunter <donald.hunter@gmail.com> De Huo <De.Huo@windriver.com> Robin Price II <robin@redhat.com> Yasir Imam <yimam@redhat.com> @@ -166,9 +170,11 @@ Last Modified: 2024-04-25 11:09 UTC Zbynek Moravec <zmoravec@redhat.com> Kazuo Moriwaka <moriwaka@users.noreply.github.com> Michael Moseley <michael@eclipse.ncsc.mil> +Nathan Moyer <nmoyer@spectric.com> Ross Murphy <RossMurphy@ibm.com> Renaud Métrich <rmetrich@redhat.com> Joe Nall <joe@nall.com> +namoyer10 <48189779+namoyer10@users.noreply.github.com> Neiloy <neiloy@redhat.com> Axel Nennker <axel@nennker.de> Michele Newman <mnewman@redhat.com> @@ -218,11 +224,11 @@ Last Modified: 2024-04-25 11:09 UTC Chris Ruffalo <chris.ruffalo@gmail.com> Benjamin Ruland <benjamin.ruland@gmail.com> rumch-se <77793453+rumch-se@users.noreply.github.com> -Rutvik <32413084+rutvik23@users.noreply.github.com> -rutvik23 <rutksh@gmail.com> +Rutvik <rutksh@gmail.com> Ray Shaw (Cont ARL/CISD) rvshaw <rvshaw@esme.arl.army.mil> Earl Sampson <ESampson@suse.com> sampsone <esampson@suse.com> +Mirco Santori <mirco.santori@roche.com> Willy Santos <wsantos@redhat.com> Nagarjuna Sarvepalli <snagarju@redhat.com> Anderson Sasaki <33833274+ansasaki@users.noreply.github.com> @@ -276,7 +282,7 @@ Last Modified: 2024-04-25 11:09 UTC vtrubovics <82443408+vtrubovics@users.noreply.github.com> Samuel Warren <swarren@redhat.com> wcushen <54533890+wcushen@users.noreply.github.com> -Shawn Wells <shawn@shawndwells.io> +Shawn Wells <shawn@redhat.com> Whidix <31294015+Whidix@users.noreply.github.com> Daniel E. White <linuxdan@users.noreply.github.com> Bernhard M. Wiedemann <bwiedemann@suse.de> @@ -284,6 +290,7 @@ Last Modified: 2024-04-25 11:09 UTC Willumpie <willumpie@xs4all.nl> Rob Wilmoth <rwilmoth@redhat.com> win97pro <win97pro@protonmail.com> +wqian <alan.moore@canonical.com> Lucas Yamanishi <lucas.yamanishi@onyxpoint.com> Xirui Yang <xirui.yang@oracle.com> Yuqing Yang <yyq01323329@alibaba-inc.com>