Merge remote-tracking branch 'upstream/stable-1.9' into stable-1.10

pmem · Nov 23, 2020 · 0c4a5b7 · 0c4a5b7
2 parents 3eccb53 + 597d5c2
commit 0c4a5b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml
@@ -66,8 +66,8 @@ jobs:
     steps:
        - name: Update Path
          run: |
-           echo "::add-path::$Env:msbuild"
-           echo "::add-path::$Env:perl"
+           echo "${env:msbuild}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+           echo "${env:perl}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
        - name: Clone the git repo
          uses: actions/checkout@v2

diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,14 @@ Wed Oct 28 2020 Piotr Balcer <piotr.balcer@intel.com>
 	foreseeable future, but we'd like to encourage any new applications to
 	leverage libpmem2.
 
+Wed Oct 28 2020 Piotr Balcer <piotr.balcer@intel.com>
+
+	* Version 1.9.2
+
+	This release reverts an incorrect change in SDS handling
+	"pool: disable SDS check if not supported", and introduces
+	a proper fix for the issues that patch attempted to correct.
+
 Wed Sep 16 2020 Piotr Balcer <piotr.balcer@intel.com>
 
 	* Version 1.9.1