From 69bc522a0c190ad93011c0dd0b1f956bfa4db1b9 Mon Sep 17 00:00:00 2001 From: Murtaza Hassan Date: Tue, 9 Jul 2019 19:58:02 +0200 Subject: [PATCH 1/2] HBASE-19230 Write up fixVersion policy from dev discussion in refguide --- src/main/asciidoc/_chapters/developer.adoc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 3c02fe50bd7a..0f5b5d034760 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -1783,6 +1783,25 @@ We use Git for source code management and latest development happens on `master` branches for past major/minor/maintenance releases and important features and bug fixes are often back-ported to them. +=== Policy for Fix Version in JIRA + +Currently branch-1 points to branch-1.5 as the upcoming HBase 1.x release. The policy for Fix +Version in Jira is defined below. + +To determine if a given fix is in a given release purely from the release numbers following rules +are defined: + +Fix version of X.Y.Z => fixed in all releases X.Y.Z' (where Z' = Z). +Fix version of X.Y.0 => fixed in all releases X.Y'.* (where Y' = Y). +Fix version of X.0.0 => fixed in all releases X'.\*.* (where X' = X). + +By this policy, fix version of 1.3.0 implies 1.4.0, but 1.3.2 does not imply 1.4.0 as we could not +tell purely from the numbers which release came first. + +Also, branch-1 and branch-1.4 have diverged so a fix in one does not necessarily mean a fix is in +the other. There are few things committed to branch-1 which are not in branch-1.4. Fix versions are +set accordingly (1.5.0 is in the set, 1.4.0 is not). + [[code.standards]] === Code Standards From 88c88c38b3a3d2fe4e8d7aac3f2c33235853f848 Mon Sep 17 00:00:00 2001 From: Murtaza Hassan Date: Thu, 11 Jul 2019 12:01:33 +0200 Subject: [PATCH 2/2] HBASE-19230 Addressed comments made by Jan --- src/main/asciidoc/_chapters/developer.adoc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 0f5b5d034760..1d3dd0a4cc65 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -1785,9 +1785,6 @@ branches for past major/minor/maintenance releases and important features and bu === Policy for Fix Version in JIRA -Currently branch-1 points to branch-1.5 as the upcoming HBase 1.x release. The policy for Fix -Version in Jira is defined below. - To determine if a given fix is in a given release purely from the release numbers following rules are defined: @@ -1798,10 +1795,6 @@ Fix version of X.0.0 => fixed in all releases X'.\*.* (where X' = X). By this policy, fix version of 1.3.0 implies 1.4.0, but 1.3.2 does not imply 1.4.0 as we could not tell purely from the numbers which release came first. -Also, branch-1 and branch-1.4 have diverged so a fix in one does not necessarily mean a fix is in -the other. There are few things committed to branch-1 which are not in branch-1.4. Fix versions are -set accordingly (1.5.0 is in the set, 1.4.0 is not). - [[code.standards]] === Code Standards