This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b7146676f68c0e0431faa825cc8b70c06fe31090 Merge: 1900510 af09724 Author: Mick Semb Wever <[email protected]> AuthorDate: Tue Mar 10 09:02:10 2020 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + .../cassandra/serializers/MapSerializer.java | 4 ++ .../cassandra/serializers/SetSerializer.java | 4 ++ .../cassandra/db/commitlog/CommitLogTest.java | 43 +++++++++++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 967675f,9a10106..c596be9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,7 +1,8 @@@ -3.0.21 +3.11.7 +Merged from 3.0: * Run evictFromMembership in GossipStage (CASSANDRA-15592) Merged from 2.2: + * Fix Commit log replays when static column clustering keys are collections (CASSANDRA-14365) * Fix Red Hat init script on newer systemd versions (CASSANDRA-15273) * Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567) diff --cc test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java index 215ad6c,479a090..895cfd0 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java @@@ -77,14 -74,17 +77,15 @@@ public class CommitLogTes private static final String KEYSPACE2 = "CommitLogTestNonDurable"; private static final String STANDARD1 = "Standard1"; private static final String STANDARD2 = "Standard2"; + private static final String CUSTOM1 = "Custom1"; - public CommitLogTest(ParameterizedClass commitLogCompression) - { - DatabaseDescriptor.setCommitLogCompression(commitLogCompression); - } + private static JVMStabilityInspector.Killer oldKiller; + private static KillerForTests testKiller; - @Before - public void setUp() throws IOException + public CommitLogTest(ParameterizedClass commitLogCompression, EncryptionContext encryptionContext) { - CommitLog.instance.resetUnsafe(true); + DatabaseDescriptor.setCommitLogCompression(commitLogCompression); + DatabaseDescriptor.setEncryptionContext(encryptionContext); } @Parameters() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
