Skip to content

Commit

Permalink
Merge pull request #3659 from yuumasato/update_contributors_0_1_42
Browse files Browse the repository at this point in the history
Bump version and contributors list for v0.1.42
  • Loading branch information
yuumasato authored Dec 11, 2018
2 parents 3e57b43 + 0b7e7d2 commit 0db5ec5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set(SSG_KICKSTART_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/scap-security-guide/kick

set(SSG_MAJOR_VERSION 0)
set(SSG_MINOR_VERSION 1)
set(SSG_PATCH_VERSION 41)
set(SSG_PATCH_VERSION 42)
set(SSG_VERSION "${SSG_MAJOR_VERSION}.${SSG_MINOR_VERSION}.${SSG_PATCH_VERSION}")

set(SSG_VENDOR "ssgproject" CACHE STRING "Specify the XCCDF 1.2 vendor string.")
Expand Down
4 changes: 3 additions & 1 deletion Contributors.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!---This file is generated using the contributors.py script. DO NOT MANUALLY EDIT!!!!
Last Modified: 2018-10-01 11:13
Last Modified: 2018-12-11 13:37
--->

The following people have contributed to the SCAP Security Guide project
Expand Down Expand Up @@ -36,13 +36,15 @@ The following people have contributed to the SCAP Security Guide project
* drax <applezip@gmail.com>
* Greg Elin <gregelin@gitmachines.com>
* Leah Fisher <lfisher047@gmail.com>
* Alijohn Ghassemlouei <alijohn.ghassemlouei@sapns2.com>
* Andrew Gilmore <agilmore2@gmail.com>
* Joshua Glemza <jglemza@nasa.gov>
* Loren Gordon <lorengordon@users.noreply.github.com>
* Steve Grubb <sgrubb@redhat.com>
* Marek Haicman <mhaicman@redhat.com>
* Rebekah Hayes <rhayes@corp.rivierautilities.com>
* Trey Henefield <thenefield@gmail.com>
* Henning Henkel <henning.henkel@helvetia.ch>
* hex2a <hex2a@users.noreply.github.com>
* John Hooks <jhooks@starscream.pa.jhbcomputers.com>
* Robin Price II <robin@redhat.com>
Expand Down
4 changes: 3 additions & 1 deletion Contributors.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--This file is generated using the contributors.py script. DO NOT MANUALLY EDIT!!!!
Last Modified: 2018-10-01 11:13
Last Modified: 2018-12-11 13:37
-->

<text>
Expand Down Expand Up @@ -34,13 +34,15 @@ Last Modified: 2018-10-01 11:13
<contributor>drax &lt;applezip@gmail.com&gt;</contributor>
<contributor>Greg Elin &lt;gregelin@gitmachines.com&gt;</contributor>
<contributor>Leah Fisher &lt;lfisher047@gmail.com&gt;</contributor>
<contributor>Alijohn Ghassemlouei &lt;alijohn.ghassemlouei@sapns2.com&gt;</contributor>
<contributor>Andrew Gilmore &lt;agilmore2@gmail.com&gt;</contributor>
<contributor>Joshua Glemza &lt;jglemza@nasa.gov&gt;</contributor>
<contributor>Loren Gordon &lt;lorengordon@users.noreply.github.com&gt;</contributor>
<contributor>Steve Grubb &lt;sgrubb@redhat.com&gt;</contributor>
<contributor>Marek Haicman &lt;mhaicman@redhat.com&gt;</contributor>
<contributor>Rebekah Hayes &lt;rhayes@corp.rivierautilities.com&gt;</contributor>
<contributor>Trey Henefield &lt;thenefield@gmail.com&gt;</contributor>
<contributor>Henning Henkel &lt;henning.henkel@helvetia.ch&gt;</contributor>
<contributor>hex2a &lt;hex2a@users.noreply.github.com&gt;</contributor>
<contributor>John Hooks &lt;jhooks@starscream.pa.jhbcomputers.com&gt;</contributor>
<contributor>Robin Price II &lt;robin@redhat.com&gt;</contributor>
Expand Down
1 change: 1 addition & 0 deletions ssg/contributors.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
# Shawn Wells
"shawn@localhost.localdomain": "shawn@redhat.com",
"shawnw@localhost.localdomain": "shawn@redhat.com",
"shawndwells@gmail.com": "shawn@redhat.com",

# No idea / ignore
"lyd@chippy.(none)": "",
Expand Down

0 comments on commit 0db5ec5

Please sign in to comment.