Merge branch 'dev'

pymodbus-dev · Dec 20, 2024 · ee018e0 · ee018e0
2 parents 05700b8 + 231941e
commit ee018e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,7 +9,7 @@ helps make pymodbus a better product.
 
 Version 3.8.2
 -------------
-
+* Asyncio future removed from sync client. (#2514)
 
 Version 3.8.1
 -------------

diff --git a/MAKE_RELEASE.rst b/MAKE_RELEASE.rst
@@ -26,13 +26,14 @@ Prepare/make release on dev.
    * Wait for CI to complete
    * git pull
 * Checkout master locally
+   * git pull
    * git merge dev
    * git push
    * git branch -D master
    * wait for CI to complete on all branches
 * On github "prepare release"
-   * Create tag e.g. v3.7.0dev0
-   * Title "pymodbus v3.7.0dev0"
+   * Create tag e.g. v3.9.0dev0
+   * Title "pymodbus v3.9.0dev0"
    * do NOT generate release notes, but copy from CHANGELOG.rst
    * make release (remember to mark pre-release if so)
 * on local repo
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ helps make pymodbus a better product. @@
     Version 3.8.2
     -------------
+    * Asyncio future removed from sync client. (#2514)
     Version 3.8.1
     -------------
@@ Expand Down @@