Merge pull request #568 from lorengordon/0.9.4

Prepares 0.9.4 release
plus3it · Apr 4, 2018 · 25140a5 · 25140a5
2 parents 564713b + d8495f7
commit 25140a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.4.dev
+current_version = 0.9.4
 commit = False
 tag = False
 tag_name = {new_version}
@@ -9,5 +9,6 @@ tag_name = {new_version}
 [bumpversion:file:CHANGELOG.md]
 
 [bumpversion:part:release]
-values =
+values = 
 	dev
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,16 @@
 ## Changelog
 
-### 0.9.4.dev
+### 0.9.4
 
-**Commit Delta**: [Change from 0.9.3 release](https://github.com/plus3it/watchmaker/compare/0.9.3...0.9.4.dev)
+**Commit Delta**: [Change from 0.9.3 release](https://github.com/plus3it/watchmaker/compare/0.9.3...0.9.4)
 
-**Released**: PLACEHOLDER
+**Released**: 2018.04.09
 
 **Summary**:
 
-*   PLACEHOLDER
+*   ash-windows-formula
+    -   Updates STIG baselines to address all findings in latest SCAP
+        benchmarks
 
 ### 0.9.3
 

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.9.4.dev
+version = 0.9.4
 author = Plus3IT Maintainers of Watchmaker
 author_email = [email protected]
 url = https://github.com/plus3it/watchmaker

diff --git a/src/watchmaker/static/salt/formulas/ash-windows-formula b/src/watchmaker/static/salt/formulas/ash-windows-formula
+12 −0		ash-windows/stig/IE_11/stig.yml
+2 −2		ash-windows/stig/Windows_2008ServerR2_DC/stig_audit.csv
+2 −2		ash-windows/stig/Windows_2008ServerR2_MS/stig_audit.csv
+6 −2		ash-windows/stig/Windows_2012ServerR2_DC/stig.yml
+1 −1		ash-windows/stig/Windows_2012ServerR2_DC/stig_audit.csv
+6 −2		ash-windows/stig/Windows_2012ServerR2_MS/stig.yml
+1 −1		ash-windows/stig/Windows_2012ServerR2_MS/stig_audit.csv
+12 −0		ash-windows/stig/Windows_2016Server_DC/stig.yml
+12 −0		ash-windows/stig/Windows_2016Server_MS/stig.yml