[
https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17165890#comment-17165890
]
David Capwell commented on CASSANDRA-15967:
-------------------------------------------
Adding the following to make this more clear
{code}
$ git diff
diff --git a/doc/source/development/how_to_commit.rst
b/doc/source/development/how_to_commit.rst
index 8b59049876..528ac40ced 100644
--- a/doc/source/development/how_to_commit.rst
+++ b/doc/source/development/how_to_commit.rst
@@ -67,6 +67,23 @@ On trunk:
On any branch:
#. ``git push origin cassandra-3.0 cassandra-3.3 trunk --atomic``
+If the patch is for an older branch, and doesn't impact later branches (such
as trunk), we still need to merge up.
+
+On cassandra-3.0:
+ #. ``git cherry-pick <sha-of-3.0-commit>`` (if we have a problem b/c of
CHANGES.txt not merging anymore, we fix it ourselves, in place)
+ #. ``ant realclean && ant jar build-test`` (rebuild to make sure code
compiles)
+
+On cassandra-3.3:
+ #. ``git merge cassandra-3.0 -s ours``
+ #. ``ant realclean && ant jar build-test`` (rebuild to make sure code
compiles)
+
+On trunk:
+ #. ``git merge cassandra-3.3 -s ours``
+ #. ``ant realclean && ant jar build-test`` (rebuild to make sure code
compiles)
+
+On any branch:
+ #. ``git push origin cassandra-3.0 cassandra-3.3 trunk --atomic``
+
{code}
> Add support in jvm dtest to test thrift
> ---------------------------------------
>
> Key: CASSANDRA-15967
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15967
> Project: Cassandra
> Issue Type: Improvement
> Components: Test/dtest
> Reporter: David Capwell
> Assignee: David Capwell
> Priority: Normal
> Fix For: 3.0.22, 3.11.8, 2.2.18
>
>
> In 2.2 and 3.x thrift is supported and can cause problems for the non thrift
> code. To make sure we can test these interactions, need to add support for
> thrift in jvm dtest.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
