From 92bd1984b3d239198cba9acfa9941fe262b6d971 Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Thu, 23 Apr 2020 20:52:44 +0100 Subject: [PATCH 1/4] add backport policy --- .../en/docs/contribution-guidelines/backport-policy.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 website/content/en/docs/contribution-guidelines/backport-policy.md diff --git a/website/content/en/docs/contribution-guidelines/backport-policy.md b/website/content/en/docs/contribution-guidelines/backport-policy.md new file mode 100644 index 0000000000..ddfe54909e --- /dev/null +++ b/website/content/en/docs/contribution-guidelines/backport-policy.md @@ -0,0 +1,8 @@ +--- +title: Backport Policy +weight: 30 +--- + +Usually, just very critical issues are backport. Also, it is just done to the most recent release. This kind of decision and discussion can get in place during the Triage meeting. For further information about how contact the team and attending the meetings check the [community](https://github.com/operator-framework/community) repository. + +Note that, if maintainers run across backport-able issues while working, it is possible to immediately decide to backport it. And then, the process would be track the issue in the repository and to do two pull requests with the fix where one should be made against the master branch and the other should be a cherry-pick against the most recent release branch where it will be backported. From a21c75760dd677a10c65db9771c6d0cda453b7fb Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Fri, 24 Apr 2020 00:27:31 +0100 Subject: [PATCH 2/4] Update website/content/en/docs/contribution-guidelines/backport-policy.md --- .../content/en/docs/contribution-guidelines/backport-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/docs/contribution-guidelines/backport-policy.md b/website/content/en/docs/contribution-guidelines/backport-policy.md index ddfe54909e..0a3c9c6fe0 100644 --- a/website/content/en/docs/contribution-guidelines/backport-policy.md +++ b/website/content/en/docs/contribution-guidelines/backport-policy.md @@ -3,6 +3,6 @@ title: Backport Policy weight: 30 --- -Usually, just very critical issues are backport. Also, it is just done to the most recent release. This kind of decision and discussion can get in place during the Triage meeting. For further information about how contact the team and attending the meetings check the [community](https://github.com/operator-framework/community) repository. +Usually, only very critical issues are backported. Also, it is just done to the most recent release. This can be discussed and decided during the weekly Triage meeting. For further information about how to contact the team and attending the meetings check the [community](https://github.com/operator-framework/community) repository. Note that, if maintainers run across backport-able issues while working, it is possible to immediately decide to backport it. And then, the process would be track the issue in the repository and to do two pull requests with the fix where one should be made against the master branch and the other should be a cherry-pick against the most recent release branch where it will be backported. From dd8ac9e4123e41deae52b9ecb3fc53ac7591a2ec Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Fri, 24 Apr 2020 14:46:32 +0100 Subject: [PATCH 3/4] Update website/content/en/docs/contribution-guidelines/backport-policy.md Co-Authored-By: Bharathi Tenneti --- .../content/en/docs/contribution-guidelines/backport-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/docs/contribution-guidelines/backport-policy.md b/website/content/en/docs/contribution-guidelines/backport-policy.md index 0a3c9c6fe0..b97757f47d 100644 --- a/website/content/en/docs/contribution-guidelines/backport-policy.md +++ b/website/content/en/docs/contribution-guidelines/backport-policy.md @@ -5,4 +5,4 @@ weight: 30 Usually, only very critical issues are backported. Also, it is just done to the most recent release. This can be discussed and decided during the weekly Triage meeting. For further information about how to contact the team and attending the meetings check the [community](https://github.com/operator-framework/community) repository. -Note that, if maintainers run across backport-able issues while working, it is possible to immediately decide to backport it. And then, the process would be track the issue in the repository and to do two pull requests with the fix where one should be made against the master branch and the other should be a cherry-pick against the most recent release branch where it will be backported. +Note that, if maintainers run across backport-able issues while working, it is possible to immediately decide to backport it. And then, the process would be to track the issue in the repository, and to do two pull requests with the fix. One should be made against the master branch, and the other should be a cherry-pick against the most recent release branch, where it will be backported. From 2dcfd97cf7f32a4d3193012217f768275b5798e8 Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Fri, 24 Apr 2020 14:46:39 +0100 Subject: [PATCH 4/4] Update website/content/en/docs/contribution-guidelines/backport-policy.md Co-Authored-By: Bharathi Tenneti --- .../content/en/docs/contribution-guidelines/backport-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/docs/contribution-guidelines/backport-policy.md b/website/content/en/docs/contribution-guidelines/backport-policy.md index b97757f47d..5cf637f68d 100644 --- a/website/content/en/docs/contribution-guidelines/backport-policy.md +++ b/website/content/en/docs/contribution-guidelines/backport-policy.md @@ -3,6 +3,6 @@ title: Backport Policy weight: 30 --- -Usually, only very critical issues are backported. Also, it is just done to the most recent release. This can be discussed and decided during the weekly Triage meeting. For further information about how to contact the team and attending the meetings check the [community](https://github.com/operator-framework/community) repository. +Usually, only very critical issues are backported. Also, it is just done to the most recent release. This can be discussed and decided during the weekly Triage meeting. For further information about how to contact the team and attending the meetings, check the [community](https://github.com/operator-framework/community) repository. Note that, if maintainers run across backport-able issues while working, it is possible to immediately decide to backport it. And then, the process would be to track the issue in the repository, and to do two pull requests with the fix. One should be made against the master branch, and the other should be a cherry-pick against the most recent release branch, where it will be backported.