Skip to content

Commit

Permalink
DAOS-8781 build: move master to 2.4 test builds (#8638)
Browse files Browse the repository at this point in the history
Release branch (release/2.2) was created for the 2.2.x release stream.
Master is now moving to 2.4 test builds. Bump version to 2.3.100.

Signed-off-by: Johann Lombardi <[email protected]>
  • Loading branch information
johannlombardi authored Apr 6, 2022
1 parent edb32c7 commit fa02c6e
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.100-tb
2.3.100-tb
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.100
2.3.100
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.3.100-1) unstable; urgency=medium
[ Johann Lombardi ]
* Bump version to 2.3.100

-- Johann Lombardi <[email protected]> Wed, 6 Apr 2022 12:00:00 +0800

daos (2.1.100-26) unstable; urgency=medium
[ Joseph Moore ]
* Add build depends entries for UCX libraries
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ and may also describe features that are currently under development for the
next DAOS release.

!!! warning
DAOS v2.2 is under active development. Use at your own risk. Please consider
DAOS v2.4 is under active development. Use at your own risk. Please consider
a stable DAOS release (i.e., 2.0.x) for production deployments.
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project Information
site_name: DAOS v2.2 - dev
site_name: DAOS v2.4 - dev
site_description: Distributed Asynchronous Object Storage
site_author: DAOS Project

Expand Down
11 changes: 7 additions & 4 deletions utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
%endif

Name: daos
Version: 2.1.100
Release: 26%{?relval}%{?dist}
Version: 2.3.100
Release: 1%{?relval}%{?dist}
Summary: DAOS Storage Engine

License: BSD-2-Clause-Patent
Expand Down Expand Up @@ -562,8 +562,11 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
# No files in a shim package

%changelog
* Wed Apr 6 2022 Joseph Moore <[email protected]> 2.1.100-22
- ADD build depends entries for UCX libraries.
* Wed Apr 6 2022 Johann Lombardi <[email protected]> 2.3.100-1
- Switch version to 2.3.100 for 2.4 test builds

* Wed Apr 6 2022 Joseph Moore <[email protected]> 2.1.100-26
- Add build depends entries for UCX libraries.

* Sat Apr 2 2022 Joseph Moore <[email protected]> 2.1.100-25
- Update to mercury 2.1.0.rc4-8 to include UCX provider patch
Expand Down

0 comments on commit fa02c6e

Please sign in to comment.