Merge pull request #2675 from eemperor/0.26.5

Releases watchmaker version 0.26.5
plus3it · Mar 10, 2023 · 829a8dc · 829a8dc
2 parents f67e743 + 54a6123
commit 829a8dc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.26.4
+current_version = 0.26.5
 commit = False
 tag = False
 tag_name = {new_version}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.26.5](https://github.com/plus3it/watchmaker/releases/tag/0.26.5)
+
+**Released**: 2023.03.10
+
+**Summary**:
+
+*   join-domain-formula
+    -   Linux: Output journald logs on join-domain failures
+    -   Linux: Re-order sssd conf file Salt states and explicitly set replace setting to false
+    -   Linux: Patch find-collision.sh script to fix computer-object search
+
 ## [0.26.4](https://github.com/plus3it/watchmaker/releases/tag/0.26.4)
 
 **Released**: 2023.03.03

diff --git a/docs/conf.py b/docs/conf.py
@@ -92,7 +92,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.26.4'
+version = '0.26.5'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.26.4
+version = 0.26.5
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker