Skip to content

common: merge stable-2.1 to master #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janekmi merged 10 commits into from
Nov 21, 2025
+3 −3
Merged

common: merge stable-2.1 to master #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e24692
Merge pull request #6140 from osalyk/release2.1.1
janekmi Feb 17, 2025
0c6af13
Merge pull request #6148 from pmem/master
janekmi Feb 18, 2025
e24d505
Merge pull request #6151 from pmem/master
osalyk Feb 21, 2025
35e8a80
common: 2.1.2-rc1 release
osalyk Oct 27, 2025
f9eb131
common: git versions
osalyk Oct 27, 2025
c755942
Merge pull request #19 from daos-stack/release_2.1.2-rc1
janekmi Oct 28, 2025
f0ab78c
common: split the pmem_tests workflow + update execution times (#21)
osalyk Nov 4, 2025
5fafd22
common: 2.1.2 release
osalyk Nov 4, 2025
7fdbee9
common: git versions
osalyk Nov 4, 2025
395360f
Merge remote-tracking branch 'origin/stable-2.1' into HEAD
janekmi Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
XXX
Tue Nov 4 2025 Oksana Sałyk <oksana.salyk@hpe.com>

* Version X.X.X
* Version 2.1.2

- Set up a new home for pmdk software (pmem/pmdk -> daos-stack/pmdk).
- Reorganized PMem HW tests to accommodate changes in HW supplies (daos-stack/pmdk#9-12).
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ cd pmdk
For a stable version, checkout a [release tag](https://github.com/pmem/pmdk/releases) as follows. Otherwise skip this step to build the latest development release.

```sh
git checkout tags/2.1.1
git checkout tags/2.1.2
```

Once all required [dependencies](#dependencies) are installed, PMDK is built using the
Expand Down
Loading