[
https://issues.apache.org/jira/browse/CASSANDRA-18196?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17935591#comment-17935591
]
Caleb Rackliffe edited comment on CASSANDRA-18196 at 3/17/25 4:26 PM:
----------------------------------------------------------------------
Just started working on [a
rebase|https://github.com/maedhroz/cassandra/commits/cep-15-accord-rebase-2025-03-14/]
of {{cep-15-accord}} to {{trunk}} as of today...
was (Author: maedhroz):
Just started working on a rebase of {{cep-15-accord}} to {{trunk}} as of
today...
> Initial Merge of Accord Feature Branch to Trunk
> -----------------------------------------------
>
> Key: CASSANDRA-18196
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18196
> Project: Apache Cassandra
> Issue Type: Task
> Components: Accord
> Reporter: Caleb Rackliffe
> Assignee: Caleb Rackliffe
> Priority: High
> Fix For: 5.x
>
>
> Once we've resolved our feature flags situation (see CASSANDRA-18195) and
> in-flight work (see CASSANDRA-18192) we want before merge, here is the rough
> plan for getting {{cep-15-accord}} merged to {{trunk}}:
> 1.) Run cep-15-accord pre-squash against CircleCI to establish a baseline.
> 2.) Squash ninja commits out of cep-15-accord and rerun tests pre-rebase.
> 2.) Rebase cep-15-accord to trunk and rerun tests.
> 4.) Merge cep-15-accord to trunk if tests are clean and there are no public
> objections.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
