Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenZFS 10473 - zfs(1M) missing cross-reference to zfs-program(1M) #8711

Merged
merged 1 commit into from
May 6, 2019

Conversation

rlaager
Copy link
Member

@rlaager rlaager commented May 5, 2019

Motivation and Context

This ports an OpenZFS commit:
OpenZFS-issue: https://www.illumos.org/issues/10473
OpenZFS-commit: illumos/illumos-gate@736e67003

Description

One part of this commit was already applied. The only remaining substance is to add a cross-reference to zfs-program.8 at the end of zfs.8.

The date change will ultimately conflict with #8710 since there were later changes. If this is accepted first, the porting will be closer to 1:1, but it really doesn't matter, as long as the latter date is kept in the end.

How Has This Been Tested?

I viewed the man page with man.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

Note that this does NOT have a Signed-off-by, as the convention seems to be to omit that when porting OpenZFS commits, in favor of Ported-by:.

Authored by: Jason King <jason.king@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Ported-by: Richard Laager <rlaager@wiktel.com>

OpenZFS-issue: https://www.illumos.org/issues/10473
OpenZFS-commit: illumos/illumos-gate@736e67003
@codecov
Copy link

codecov bot commented May 6, 2019

Codecov Report

Merging #8711 into master will increase coverage by 0.18%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8711      +/-   ##
==========================================
+ Coverage   78.64%   78.82%   +0.18%     
==========================================
  Files         381      381              
  Lines      117615   117615              
==========================================
+ Hits        92496    92712     +216     
+ Misses      25119    24903     -216
Flag Coverage Δ
#kernel 79.32% <ø> (+0.06%) ⬆️
#user 67.76% <ø> (+0.54%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update de3e0b9...e7ca127. Read the comment docs.

@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label May 6, 2019
@behlendorf behlendorf merged commit bca0641 into openzfs:master May 6, 2019
allanjude pushed a commit to allanjude/zfs that referenced this pull request Jun 7, 2019
Authored by: Jason King <jason.king@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Dan McDonald <danmcd@joyent.com>
Ported-by: Richard Laager <rlaager@wiktel.com>

OpenZFS-issue: https://www.illumos.org/issues/10473
OpenZFS-commit: illumos/illumos-gate@736e67003
Closes openzfs#8711
allanjude pushed a commit to allanjude/zfs that referenced this pull request Jun 15, 2019
Authored by: Jason King <jason.king@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Dan McDonald <danmcd@joyent.com>
Ported-by: Richard Laager <rlaager@wiktel.com>

OpenZFS-issue: https://www.illumos.org/issues/10473
OpenZFS-commit: illumos/illumos-gate@736e67003
Closes openzfs#8711
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants