Skip to content

Commit

Permalink
Merge pull request #536 from lorengordon/0.9.3
Browse files Browse the repository at this point in the history
Prepares watchmaker 0.9.3 release
  • Loading branch information
lorengordon authored Mar 8, 2018
2 parents a823594 + b820d97 commit e446079
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.9.3.dev
current_version = 0.9.3
commit = False
tag = False
tag_name = {new_version}
Expand All @@ -9,5 +9,6 @@ tag_name = {new_version}
[bumpversion:file:CHANGELOG.md]

[bumpversion:part:release]
values =
values =
dev

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ deploy:
name: $WAM_VERSION
tag_name: $WAM_VERSION
body: $WAM_BODY
draft: true
draft: false
skip_cleanup: true
api_key:
secure: NZQua4PHfAugtez+Kkp+TZxxg8sgFPuTnEmJmQ/BBazUTWy5IGcMJFcQxI6y+YVmiiMshwV36B53sQaY9lLwZEaPARjPMNprBCRuGR436s5UrkmDSAl2uH7kbpEkbsIA2L4V++85v0q2PVSacgWW8abGs0mHydA6chHKewlvKiyI5PqlEhgABPx5LDIF2Wmrg/YfdPxtmMb9IHP0LN1sj5x59dxe727fbY6/kUpb4mrQ306EHBYSMi4E2mpP2zIlrt21KUuU8iFHNaRKUzSlq5Lva4JeoKlh3RT7G3YA4u+7dH5eJUxnHFFhFnLBIz1d2wDY1tVaEGX1CDAKW6lSCBBOarnLnDkvtLDD23NVUNXC81+7OLObaw63rtubfC3syZ1Kp517R4vgIZwRhBrvvJDr2IO5X/YtHVETBwkhDb8Ol8djXrwRbOeEgGWwkU66BbgX2HlcoggQqDhDWZWBosu7iz01pXvAFKiylNHbPULNV2gOM9HzY0kmxq3/zzwdBfLxJH8delSCK1uvQpZlmaBW6SA0/l7yuoxDN8KrXSRgwuE9A3XuMe6ZhbU5AZSqWA7vMdnwCg05xK2zo3Xohi7QE4AxY1jZW2ficBWWWFcdUTZpG+TRKC8LzQWBmZ61s9lNn+HfFC5yqYkJopLPeRYzfyeUJN79rr9leC04sVI=
Expand Down
24 changes: 20 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
## Changelog

### 0.9.3.dev
### 0.9.3

**Commit Delta**: [Change from 0.9.2 release](https://github.com/plus3it/watchmaker/compare/0.9.2...0.9.3.dev)
**Commit Delta**: [Change from 0.9.2 release](https://github.com/plus3it/watchmaker/compare/0.9.2...0.9.3)

**Released**: TBD
**Released**: 2017.03.08

**Summary**:

* TBD
* scap-formula
- Incorporates content from OpenSCAP Security Guide v0.1.38-1
- Incorporates content from latest DISA SCAP benchmarks
- Microsoft Internet Explorer 11 STIG Benchmark - Ver 1, Rel 11
- Microsoft Windows 10 STIG Benchmark - Ver 1, Rel 10
- Microsoft Windows 2008 R2 DC STIG Benchmark - Ver 1, Rel 27
- Microsoft Windows 2008 R2 MS STIG Benchmark - Ver 1, Rel 28
- Microsoft Windows 2012 and 2012 R2 DC STIG Benchmark - Ver 2, Rel 11
- Microsoft Windows 2012 and 2012 R2 MS STIG Benchmark - Ver 2, Rel 11
- Microsoft Windows 8/8.1 STIG Benchmark - Ver 1, Rel 21
- Microsoft Windows Server 2016 STIG Benchmark - Ver 1, Rel 4
- Red Hat 6 STIG Benchmark - Ver 1, Rel 18
- Red Hat 7 STIG Benchmark - Ver 1, Rel 2
* dotnet4-formula
- Skips dotnet4 hotfix install if a newer version is already installed
- Creates per-OS maps for hotfix updates, since the hotfix id varies per
OS

### 0.9.2

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ specify something like this for EC2 userdata:
$GitRepo = "https://github.com/<your-github-username>/watchmaker.git"
$GitBranch = "<your-branch>"
$BootstrapUrl = "https://raw.githubusercontent.com/plus3it/watchmaker/master/docs/files/bootstrap/watchmaker-bootstrap.ps1"
$BootstrapUrl = "https://raw.githubusercontent.com/plus3it/watchmaker/develop/docs/files/bootstrap/watchmaker-bootstrap.ps1"
$PythonUrl = "https://www.python.org/ftp/python/3.6.4/python-3.6.4-amd64.exe"
$GitUrl = "https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/Git-2.16.2-64-bit.exe"
$PypiUrl = "https://pypi.org/simple"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[metadata]
name = watchmaker
description = Applied Configuration Management
version = 0.9.3.dev
version = 0.9.3
author = Plus3IT Maintainers of Watchmaker
author_email = [email protected]
url = https://github.com/plus3it/watchmaker
Expand Down
2 changes: 1 addition & 1 deletion src/watchmaker/static/salt/formulas/dotnet4-formula
2 changes: 1 addition & 1 deletion src/watchmaker/static/salt/formulas/scap-formula
Submodule scap-formula updated 52 files
+14,201 −0 scap/content/guides/disa/stig-el6.xml
+15,302 −0 scap/content/guides/disa/stig-el7.xml
+0 −8 scap/content/guides/disa/stig-ie11-cpe-dictionary.xml
+0 −47 scap/content/guides/disa/stig-ie11-cpe-oval.xml
+0 −4,175 scap/content/guides/disa/stig-ie11-oval.xml
+0 −5,036 scap/content/guides/disa/stig-ie11-xccdf.xml
+9,290 −0 scap/content/guides/disa/stig-ie11.xml
+0 −7 scap/content/guides/disa/stig-win10-cpe-dictionary.xml
+0 −53 scap/content/guides/disa/stig-win10-cpe-oval.xml
+0 −8,061 scap/content/guides/disa/stig-win10-oval.xml
+0 −8,747 scap/content/guides/disa/stig-win10-xccdf.xml
+15,805 −0 scap/content/guides/disa/stig-win10.xml
+0 −11 scap/content/guides/disa/stig-win8-cpe-dictionary.xml
+0 −76 scap/content/guides/disa/stig-win8-cpe-oval.xml
+0 −11,458 scap/content/guides/disa/stig-win8-oval.xml
+0 −10,942 scap/content/guides/disa/stig-win8-xccdf.xml
+22,827 −0 scap/content/guides/disa/stig-win8.xml
+0 −7 scap/content/guides/disa/stig-ws2008r2-dc-cpe-dictionary.xml
+0 −61 scap/content/guides/disa/stig-ws2008r2-dc-cpe-oval.xml
+0 −12,917 scap/content/guides/disa/stig-ws2008r2-dc-oval.xml
+0 −9,287 scap/content/guides/disa/stig-ws2008r2-dc-xccdf.xml
+22,422 −0 scap/content/guides/disa/stig-ws2008r2-dc.xml
+0 −7 scap/content/guides/disa/stig-ws2008r2-ms-cpe-dictionary.xml
+0 −61 scap/content/guides/disa/stig-ws2008r2-ms-cpe-oval.xml
+0 −12,896 scap/content/guides/disa/stig-ws2008r2-ms-oval.xml
+0 −8,948 scap/content/guides/disa/stig-ws2008r2-ms-xccdf.xml
+21,998 −0 scap/content/guides/disa/stig-ws2008r2-ms.xml
+0 −11 scap/content/guides/disa/stig-ws2012-dc-cpe-dictionary.xml
+0 −73 scap/content/guides/disa/stig-ws2012-dc-cpe-oval.xml
+0 −8,895 scap/content/guides/disa/stig-ws2012-dc-oval.xml
+0 −10,868 scap/content/guides/disa/stig-ws2012-dc-xccdf.xml
+20,008 −0 scap/content/guides/disa/stig-ws2012-dc.xml
+0 −11 scap/content/guides/disa/stig-ws2012-ms-cpe-dictionary.xml
+0 −73 scap/content/guides/disa/stig-ws2012-ms-cpe-oval.xml
+0 −8,797 scap/content/guides/disa/stig-ws2012-ms-oval.xml
+0 −10,562 scap/content/guides/disa/stig-ws2012-ms-xccdf.xml
+19,541 −0 scap/content/guides/disa/stig-ws2012-ms.xml
+15,746 −13,948 scap/content/guides/disa/stig-ws2016.xml
+685 −232 scap/content/guides/openscap/ssg-centos6-ds.xml
+288 −106 scap/content/guides/openscap/ssg-centos6-xccdf.xml
+30,337 −34,078 scap/content/guides/openscap/ssg-centos7-ds.xml
+4,466 −5,194 scap/content/guides/openscap/ssg-centos7-xccdf.xml
+2 −2 scap/content/guides/openscap/ssg-rhel6-cpe-oval.xml
+685 −232 scap/content/guides/openscap/ssg-rhel6-ds.xml
+58 −14 scap/content/guides/openscap/ssg-rhel6-oval.xml
+288 −106 scap/content/guides/openscap/ssg-rhel6-xccdf.xml
+2 −2 scap/content/guides/openscap/ssg-rhel7-cpe-oval.xml
+30,987 −34,742 scap/content/guides/openscap/ssg-rhel7-ds.xml
+106 −62 scap/content/guides/openscap/ssg-rhel7-oval.xml
+4,466 −5,194 scap/content/guides/openscap/ssg-rhel7-xccdf.xml
+1 −0 scap/oscap/map.jinja
+1 −1 scap/oscap/scan.sls

0 comments on commit e446079

Please sign in to comment.