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

[docs] Updates to development branching #76063

Merged
merged 7 commits into from
Sep 1, 2020

Conversation

tylersmalley
Copy link
Contributor

@tylersmalley tylersmalley commented Aug 27, 2020

Updates development documentation to explain our branching strategy and better reflect our backport policy.

We have decided this information is best suited for public development docs so that it can be communicated to community contributors and referenced in pull requests.

Preview: https://kibana_76063.docs-preview.app.elstc.co/guide/en/kibana/master/development-github.html

@tylersmalley tylersmalley force-pushed the backport-policy branch 5 times, most recently from 2d2539f to 281bf59 Compare August 27, 2020 22:31
@tylersmalley tylersmalley marked this pull request as ready for review August 31, 2020 14:54
Copy link
Contributor

@kobelb kobelb 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 making these changes @tylersmalley!

docs/developer/contributing/development-github.asciidoc Outdated Show resolved Hide resolved
docs/developer/contributing/development-github.asciidoc Outdated Show resolved Hide resolved
@tylersmalley tylersmalley added release_note:skip Skip the PR/issue when compiling release notes v7.10.0 v7.9.1 v8.0.0 labels Aug 31, 2020
@tylersmalley
Copy link
Contributor Author

tylersmalley commented Aug 31, 2020

cc @watson and @joshdover since you provided feedback to the original PR. I hope the changes here will bring more light to the branching strategy and backport policy. Please let me know if there is anything you see that could use clarity.

Copy link
Contributor

@peterschretlen peterschretlen left a comment

Choose a reason for hiding this comment

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

I like this, it's clear and in 5 bullets you pretty much cover the backporting scenarios

Copy link
Contributor

@peterschretlen peterschretlen left a comment

Choose a reason for hiding this comment

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

I left a small suggestion, but think the changes are good as-is.

Copy link
Contributor

@watson watson left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@tylersmalley tylersmalley merged commit 2114017 into elastic:master Sep 1, 2020
tylersmalley pushed a commit to tylersmalley/kibana that referenced this pull request Sep 1, 2020
Signed-off-by: Tyler Smalley <[email protected]>
Co-authored-by: Stacey Gammon <[email protected]>
Co-authored-by: Brandon Kobel <[email protected]>
Co-authored-by: Peter Schretlen <[email protected]>
tylersmalley pushed a commit that referenced this pull request Sep 1, 2020
Signed-off-by: Tyler Smalley <[email protected]>
Co-authored-by: Stacey Gammon <[email protected]>
Co-authored-by: Brandon Kobel <[email protected]>
Co-authored-by: Peter Schretlen <[email protected]>\
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:skip Skip the PR/issue when compiling release notes v7.10.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants