system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-29 21:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

zfs: merge openzfs/zfs@95785196f (zfs-2.2-release) into stable/14

Browse source 
OpenZFS release 2.2.0

This commit adjusts the version numbers only.

Obtained from:	OpenZFS
OpenZFS commit:	95785196f2
OpenZFS tag:	zfs-2.2.0
This commit is contained in:
Martin Matuska 2023-10-14 20:24:39 +02:00
parent 8fca98f688 95785196f2
commit b2d6bc7597
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/contrib/openzfs/META
View file

@ -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

4
sys/modules/zfs/zfs_config.h
View file

@ -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"

2
sys/modules/zfs/zfs_gitrev.h
View file

@ -1 +1 @@
#define ZFS_META_GITREV "zfs-2.2.0-rc5-14-g2bba9fd47"
#define ZFS_META_GITREV "zfs-2.2.0-0-g95785196f"