git: 50ce252cd50d - stable/13 - ObsoleteFiles.inc: fixup after zpool-features.7.gz got re-introduced

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Wed, 22 Jun 2022 18:43:43 UTC

The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=50ce252cd50dba549a7ce020f2d537ad992653e0

commit 50ce252cd50dba549a7ce020f2d537ad992653e0
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2021-06-27 00:53:51 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-06-22 18:42:08 +0000

    ObsoleteFiles.inc: fixup after zpool-features.7.gz got re-introduced
    
    PR:             256852
    MFC after:      3 days
    
    (cherry picked from commit 2be4a7d508b02a980904378ca7c798fdf8c300d5)
---
 ObsoleteFiles.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 0235a9b285fa..80b3d681dd6f 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -2467,7 +2467,7 @@ OLD_FILES+=boot/lua/logo-orbbw.lua
 OLD_LIBS+=lib/libzfs.so.3
 OLD_LIBS+=usr/lib32/libzfs.so.3
 OLD_FILES+=usr/share/man/man1/zstreamdump.1.gz
-OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
+#OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
 
 # 20200923: memfd_test moved to /usr/tests/sys/posixshm
 OLD_FILES+=usr/tests/sys/kern/memfd_test