Merge pull request #1336 from lorengordon/0.20.5

plus3it · Jul 16, 2020 · 359edcc · 359edcc
2 parents 8dc9e8f + 9495c59
commit 359edcc
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.4
+current_version = 0.20.5
 commit = False
 tag = False
 tag_name = {new_version}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 ## Changelog
 
+### 0.20.5
+
+**Commit Delta**: [Change from 0.20.4 release](https://github.com/plus3it/watchmaker/compare/0.20.4...0.20.5)
+
+**Released**: 2020.07.16
+
+**Summary**:
+
+*   splunkforwarder-formula
+    - (Linux) Patches splunkforwarder state to work with salt 2019.2.5
+
 ### 0.20.4
 
 **Commit Delta**: [Change from 0.20.3 release](https://github.com/plus3it/watchmaker/compare/0.20.3...0.20.4)

diff --git a/requirements/report.txt b/requirements/report.txt
@@ -1,4 +1,4 @@
 argparse==1.4.0
 codecov<=2.0.5;platform_system=="Windows"  # pyup: ==2.0.5 # see https://github.com/codecov/support/issues/402
 codecov==2.0.15;platform_system!="Windows" and python_version<="2.6"
-codecov==2.1.7;platform_system!="Windows" and python_version>"2.6"
+codecov==2.1.8;platform_system!="Windows" and python_version>"2.6"
diff --git a/requirements/tox.txt b/requirements/tox.txt
@@ -2,4 +2,4 @@
 
 tox==2.9.1;python_version<="2.6"
 tox==3.14.0;python_version<="3.4" and python_version>="2.7"
-tox==3.17.0;python_version>"3.4"
+tox==3.17.1;python_version>"3.4"
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.20.4
+version = 0.20.5
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker

diff --git a/src/watchmaker/static/salt/formulas/splunkforwarder-formula b/src/watchmaker/static/salt/formulas/splunkforwarder-formula