From c13f759296eba486b1631a33d7ee9e843c2a3ebd Mon Sep 17 00:00:00 2001 From: Charalampos Fanoulis <38255093+cfanoulis@users.noreply.github.com> Date: Thu, 15 Nov 2018 14:51:01 +0200 Subject: [PATCH 1/4] doc: update collaborator guide with LTS labels --- COLLABORATOR_GUIDE.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index ec3b0a8bf503fb..53b2a4870d8324 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -794,8 +794,8 @@ TSC for further discussion. #### How are LTS Branches Managed? -There are multiple LTS branches, e.g. `v8.x` and `v6.x`. Each of these is paired -with a staging branch: `v8.x-staging` and `v6.x-staging`. +There are multiple LTS branches, e.g. `v10.x` and `v8.x`. Each of these is +paired with a staging branch: `v10.x-staging` and `v8.x-staging`. As commits land on the master branch, they are cherry-picked back to each staging branch as appropriate. If the commit applies only to the LTS branch, the @@ -817,14 +817,18 @@ on backporting, please see the [backporting guide][]. Several LTS related issue and PR labels have been provided: -* `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be considered - for landing in the `v6.x-staging` branch. -* `lts-watch-v4.x` - tells the LTS WG that the issue/PR needs to be considered - for landing in the `v4.x-staging` branch. +* `lts-watch-v10.x` - tells the LTS WG that the issue/PR needs to be + considered for landing in the `v10.x-staging` branch. +* `lts-watch-v8.x` - tells the LTS WG that the issue/PR needs to be + considered for landing in the `v10.x-staging` branch. +* `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be + considered for landing in the `v6.x-staging` branch. +* `land-on-v10.x` - tells the release team that the commit should be landed + in a future v6.x release +* `land-on-v10.x` - tells the release team that the commit should be landed + in a future v6.x release * `land-on-v6.x` - tells the release team that the commit should be landed - in a future v6.x release -* `land-on-v4.x` - tells the release team that the commit should be landed - in a future v4.x release + in a future v6.x release Any Collaborator can attach these labels to any PR/issue. As commits are landed into the staging branches, the `lts-watch-` label will be removed. From 837b3123a1baa95215b2c38e950f6e088d3bfc89 Mon Sep 17 00:00:00 2001 From: Charalampos Fanoulis <38255093+cfanoulis@users.noreply.github.com> Date: Thu, 15 Nov 2018 18:40:13 +0200 Subject: [PATCH 2/4] doc: fix indenttation in the collab. guide --- COLLABORATOR_GUIDE.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 53b2a4870d8324..2f2eef09d753bf 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -818,17 +818,17 @@ on backporting, please see the [backporting guide][]. Several LTS related issue and PR labels have been provided: * `lts-watch-v10.x` - tells the LTS WG that the issue/PR needs to be - considered for landing in the `v10.x-staging` branch. + considered for landing in the `v10.x-staging` branch. * `lts-watch-v8.x` - tells the LTS WG that the issue/PR needs to be - considered for landing in the `v10.x-staging` branch. + considered for landing in the `v10.x-staging` branch. * `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be - considered for landing in the `v6.x-staging` branch. + considered for landing in the `v6.x-staging` branch. * `land-on-v10.x` - tells the release team that the commit should be landed - in a future v6.x release + in a future v6.x release * `land-on-v10.x` - tells the release team that the commit should be landed - in a future v6.x release + in a future v6.x release * `land-on-v6.x` - tells the release team that the commit should be landed - in a future v6.x release + in a future v6.x release Any Collaborator can attach these labels to any PR/issue. As commits are landed into the staging branches, the `lts-watch-` label will be removed. From 88c3bb4e5202bf3900c765cec40be5256290598a Mon Sep 17 00:00:00 2001 From: Charalampos Fanoulis <38255093+cfanoulis@users.noreply.github.com> Date: Thu, 15 Nov 2018 18:41:30 +0200 Subject: [PATCH 3/4] doc: fix incorrect numbering in labels --- COLLABORATOR_GUIDE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 2f2eef09d753bf..5c14c15555bf71 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -820,13 +820,13 @@ Several LTS related issue and PR labels have been provided: * `lts-watch-v10.x` - tells the LTS WG that the issue/PR needs to be considered for landing in the `v10.x-staging` branch. * `lts-watch-v8.x` - tells the LTS WG that the issue/PR needs to be - considered for landing in the `v10.x-staging` branch. + considered for landing in the `v8.x-staging` branch. * `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be considered for landing in the `v6.x-staging` branch. * `land-on-v10.x` - tells the release team that the commit should be landed - in a future v6.x release -* `land-on-v10.x` - tells the release team that the commit should be landed - in a future v6.x release + in a future v10.x release +* `land-on-v8.x` - tells the release team that the commit should be landed + in a future v8.x release * `land-on-v6.x` - tells the release team that the commit should be landed in a future v6.x release From b0a38cc1b57fb01ff488399c135fec33d562b480 Mon Sep 17 00:00:00 2001 From: Charalampos Fanoulis <38255093+cfanoulis@users.noreply.github.com> Date: Thu, 15 Nov 2018 21:46:15 +0200 Subject: [PATCH 4/4] doc: fix punctuation --- COLLABORATOR_GUIDE.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 5c14c15555bf71..deadf87ed15092 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -824,11 +824,11 @@ Several LTS related issue and PR labels have been provided: * `lts-watch-v6.x` - tells the LTS WG that the issue/PR needs to be considered for landing in the `v6.x-staging` branch. * `land-on-v10.x` - tells the release team that the commit should be landed - in a future v10.x release + in a future v10.x release. * `land-on-v8.x` - tells the release team that the commit should be landed - in a future v8.x release + in a future v8.x release. * `land-on-v6.x` - tells the release team that the commit should be landed - in a future v6.x release + in a future v6.x release. Any Collaborator can attach these labels to any PR/issue. As commits are landed into the staging branches, the `lts-watch-` label will be removed.