The branch main has been updated by mm:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=2be4a7d508b02a980904378ca7c798fdf8c300d5

commit 2be4a7d508b02a980904378ca7c798fdf8c300d5
Author:     Martin Matuska <m...@freebsd.org>
AuthorDate: 2021-06-27 00:53:51 +0000
Commit:     Martin Matuska <m...@freebsd.org>
CommitDate: 2021-06-27 00:58:15 +0000

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

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index a2a423fafc9c..38cbbd7807ca 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -4052,7 +4052,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
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to