Skip to content

Commit

Permalink
DAOS-15859 build: Move master to 2.7 test builds. (#14407)
Browse files Browse the repository at this point in the history
Moving master to 2.7 test builds. Bump version to 2.7.100.

Signed-off-by: Phil Henderson <[email protected]>
  • Loading branch information
phender authored May 21, 2024
1 parent 6b06ee7 commit ff4375a
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 18 deletions.
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.101-tb
2.7.100-tb
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.101
2.7.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.7.100-1) unstable; urgency=medium
[ Phillip Henderson ]
* Bump version to 2.7.100

-- Phillip Henderson <[email protected]> Mon, 20 May 2024 12:37:00 -0500

daos (2.5.101-5) unstable; urgency=medium
[ Lei Huang ]
* Add libaio as a dependent package
Expand Down
6 changes: 3 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Welcome to DAOS Version 2.5!
# Welcome to DAOS Version 2.7!

The Distributed Asynchronous Object Storage (DAOS) is an open-source
object store designed from the ground up for massively distributed Non
Expand All @@ -15,11 +15,11 @@ In addition to on-prem deployments, DAOS can be deployed in cloud
environments. More information on cloud deployments is available
in the [DAOS in the Cloud](./cloud/) section.

The included document versions are associated with DAOS v2.5.
The included document versions are associated with DAOS v2.7.
They may also describe features that are currently under development
for a future DAOS release. Those features will be clearly marked as such.

!!! warning
DAOS v2.5 is the (unstable) master branch for DAOS v2.6 development.
DAOS v2.7 is the (unstable) master branch for DAOS v2.8 development.
Use at your own risk. Please consider the [latest](../latest/)
stable DAOS release for production deployments.
4 changes: 2 additions & 2 deletions docs/release/release_notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DAOS Version 2.6 Release Notes
# DAOS Version 2.8 Release Notes

DAOS 2.6 is under active development and has not been released yet.
DAOS 2.8 is under active development and has not been released yet.
The release is planned for late 2023.
In the meantime, please refer to the support document for the
[latest](https://docs.daos.io/latest/release/release_notes/)
Expand Down
4 changes: 2 additions & 2 deletions docs/release/support_matrix.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DAOS Version 2.6 Support
# DAOS Version 2.8 Support

DAOS 2.6 is under active development and has not been released yet.
DAOS 2.8 is under active development and has not been released yet.
The release is planned for late 2023.
In the meantime, please refer to the support document for the
[latest](https://docs.daos.io/latest/release/support_matrix/)
Expand Down
4 changes: 2 additions & 2 deletions docs/release/upgrading.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Upgrading to DAOS Version 2.6
# Upgrading to DAOS Version 2.8

DAOS 2.6 is under active development and has not been released yet.
DAOS 2.8 is under active development and has not been released yet.
The release is planned for the second half of 2023.
In the meantime, please refer to the upgrading information for the
[latest](https://docs.daos.io/latest/release/upgrading/) DAOS release.
10 changes: 5 additions & 5 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project Information
site_name: DAOS v2.5
site_name: DAOS v2.7
site_description: Distributed Asynchronous Object Storage
site_author: DAOS Project

Expand Down Expand Up @@ -57,9 +57,9 @@ markdown_extensions:
nav:
- Release Information:
- 'index.md'
- 'Release Notes v2.5': 'release/release_notes.md'
- 'Support Matrix v2.5': 'release/support_matrix.md'
- 'Upgrading to v2.5': 'release/upgrading.md'
- 'Release Notes v2.7': 'release/release_notes.md'
- 'Support Matrix v2.7': 'release/support_matrix.md'
- 'Upgrading to v2.7': 'release/upgrading.md'
- Overview:
- 'Architecture': 'overview/architecture.md'
- 'Storage Model': 'overview/storage.md'
Expand Down Expand Up @@ -108,5 +108,5 @@ nav:
- 'Dev Environment': 'dev/development.md'
- 'Contributing': 'dev/contributing.md'
- 'DAOS Internals': 'https://github.com/daos-stack/daos/blob/master/src/README.md'
- 'DAOS API Documentation': 'https://docs.daos.io/v2.5/doxygen/html/index.html'
- 'DAOS API Documentation': 'https://docs.daos.io/v2.7/doxygen/html/index.html'
# Attention: Don't change that doxygen path to a relative path, or mkdocs will stumble...
7 changes: 5 additions & 2 deletions utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
%endif

Name: daos
Version: 2.5.101
Release: 5%{?relval}%{?dist}
Version: 2.7.100
Release: 1%{?relval}%{?dist}
Summary: DAOS Storage Engine

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

%changelog
* Mon May 20 2024 Phillip Henderson <[email protected]> 2.7.100-1
- Bump version to 2.7.100

* Fri May 03 2024 Lei Huang <[email protected]> 2.5.101-5
- Add libaio as a dependent package

Expand Down

0 comments on commit ff4375a

Please sign in to comment.