hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject hbase git commit: HBASE-19475 Extended backporting strategy in documentation
Date Sat, 02 Jun 2018 09:09:47 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 7b02bb896 -> cc53ab37b


HBASE-19475 Extended backporting strategy in documentation


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cc53ab37
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cc53ab37
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cc53ab37

Branch: refs/heads/branch-1.4
Commit: cc53ab37b339448463b4deefc7b6fddaa066a723
Parents: 7b02bb8
Author: Jan Hentschel <jan.hentschel@ultratendency.com>
Authored: Sun Dec 10 15:17:50 2017 +0100
Committer: Jan Hentschel <jan.hentschel@ultratendency.com>
Committed: Sat Jun 2 11:07:27 2018 +0200

----------------------------------------------------------------------
 src/main/asciidoc/_chapters/developer.adoc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cc53ab37/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc
index 8b74690..e41597c 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -2124,7 +2124,11 @@ If the contributor used +git format-patch+ to generate the patch, their
commit m
 [[committer.amending.author]]
 ====== Add Amending-Author when a conflict cherrypick backporting
 
-We've established the practice of committing to master and then cherry picking back to branches
whenever possible.
+We've established the practice of committing to master and then cherry picking back to branches
whenever possible, unless
+
+* it's breaking compat: In which case, if it can go in minor releases, backport to branch-1
and branch-2.
+* it's a new feature: No for maintenance releases, For minor releases, discuss and arrive
at consensus.
+
 When there is a minor conflict we can fix it up and just proceed with the commit.
 The resulting commit retains the original author.
 When the amending author is different from the original committer, add notice of this at
the end of the commit message as: `Amending-Author: Author


Mime
View raw message