git: 3ac9fb49cc1c - releng/14.0 - zfs: merge openzfs/zfs@95785196f (zfs-2.2-release) into stable/14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 14 Oct 2023 22:35:42 UTC
The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3ac9fb49cc1c3d6034a449471df7ba2d24f26089 commit 3ac9fb49cc1c3d6034a449471df7ba2d24f26089 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2023-10-14 18:24:39 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2023-10-14 20:52:48 +0000 zfs: merge openzfs/zfs@95785196f (zfs-2.2-release) into stable/14 OpenZFS release 2.2.0 This commit adjusts the version numbers only. Obtained from: OpenZFS OpenZFS commit: 95785196f26e92d82cf4445654ba84e4a9671c57 OpenZFS tag: zfs-2.2.0 Approved by: re (gjb) (cherry picked from commit b2d6bc7597ebff8201c354a983a33149d1e1ef97) --- sys/contrib/openzfs/META | 2 +- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index 4178f1b5daa4..0d7df10d47db 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.2.0 -Release: rc5 +Release: 1 Release-Tags: relext License: CDDL Author: OpenZFS diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index b62dbf112b31..9c423a3e3e36 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -1095,7 +1095,7 @@ /* #undef ZFS_IS_GPL_COMPATIBLE */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g2bba9fd47" +#define ZFS_META_ALIAS "zfs-2.2.0-FreeBSD_g95785196f" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -1125,7 +1125,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g2bba9fd47" +#define ZFS_META_RELEASE "FreeBSD_g95785196f" /* Define the project version. */ #define ZFS_META_VERSION "2.2.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index db30da19109e..d1341d6a39ef 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.0-rc5-14-g2bba9fd47" +#define ZFS_META_GITREV "zfs-2.2.0-0-g95785196f"