[ https://issues.apache.org/jira/browse/CASSANDRA-15863?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17141986#comment-17141986 ]
Andres de la Peña edited comment on CASSANDRA-15863 at 6/22/20, 12:25 PM: -------------------------------------------------------------------------- It seems that 3.0 doesn't merge cleanly into 3.11 after this, there are conflicts in that call to {{StorageService#finishJoiningRing}} and in {{CHANGES.txt}}. was (Author: adelapena): It seems that 3.0 doesn't merge cleanly into 3.11 after this, there are conflicts in that call to `StorageService#finishJoiningRing` and in `CHANGES.txt`. > Bootstrap resume and TestReplaceAddress fixes > --------------------------------------------- > > Key: CASSANDRA-15863 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15863 > Project: Cassandra > Issue Type: Bug > Components: Consistency/Bootstrap and Decommission, Test/dtest > Reporter: Berenguer Blasi > Assignee: Berenguer Blasi > Priority: Normal > Fix For: 3.0.x, 3.11.x, 4.0-alpha > > Time Spent: 10m > Remaining Estimate: 0h > > This has been > [broken|https://ci-cassandra.apache.org/job/Cassandra-trunk/159/testReport/dtest-large.replace_address_test/TestReplaceAddress/test_restart_failed_replace/history/] > for ages -- 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