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

Document branching structure #10976

Merged
merged 1 commit into from
Sep 28, 2020

Conversation

PrivatePuffin
Copy link
Contributor

Motivation and Context

The currently used branching structure for releases, staging, development and backports has not been (fully) documented yet.
This PR changes that.

Description

This PR documents the currently used branching structure.

It is a cherrypicked, cut down and modified version of the change in #10853
It has been cut down to not include any controversial changes.

How Has This Been Tested?

It's just documentation

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:

Signed-off-by: Kjeld Schouten-Lebbing [email protected]
Requires-builders: style

Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for documenting this.

.github/CONTRIBUTING.md Show resolved Hide resolved
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
.github/CONTRIBUTING.md Outdated Show resolved Hide resolved
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Sep 25, 2020
This change documents the currently used branching structure.
It has been cut down to not include any controversial changes.

Signed-off-by: Kjeld Schouten-Lebbing <[email protected]>
Requires-builders: style
@PrivatePuffin
Copy link
Contributor Author

@behlendorf I polished it up a little and cleaned up the confusion.
Should be more mergable now :)

@behlendorf behlendorf merged commit 595b7e9 into openzfs:master Sep 28, 2020
behlendorf pushed a commit that referenced this pull request Oct 1, 2020
This change documents the currently used branching structure.
It has been cut down to not include any controversial changes.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Kjeld Schouten-Lebbing <[email protected]>
Closes #10976
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
This change documents the currently used branching structure.
It has been cut down to not include any controversial changes.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Kjeld Schouten-Lebbing <[email protected]>
Closes openzfs#10976
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
This change documents the currently used branching structure.
It has been cut down to not include any controversial changes.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Kjeld Schouten-Lebbing <[email protected]>
Closes openzfs#10976
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Code Review Needed Ready for review and testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants